From c276ec5fdf01b60f66ce2b697303783aa29fe1ef Mon Sep 17 00:00:00 2001
From: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
Date: Tue, 21 Jul 2020 22:01:02 -0400
Subject: [PATCH] Platforms/RaspberryPi: Return GOP PixelInformation in
 QueryMode()

Return correct values of PixelInformation in QueryMode().

This fixes the QueryMode_Func failures reported by SCT tests at
https://github.com/pftf/RPi4/issues/73

Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Pete Batard <pete@akeo.ie>
Cc: Andrei Warkentin <awarkentin@vmware.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
Reviewed-by: Andrei Warkentin <awarkentin@vmware.com>
---
 Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c b/Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c
index 5b79a24c..01d9904c 100644
--- a/Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c
+++ b/Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c
@@ -191,6 +191,10 @@ DisplayQueryMode (
   (*Info)->HorizontalResolution = Mode->Width;
   (*Info)->VerticalResolution = Mode->Height;
   (*Info)->PixelFormat = This->Mode->Info->PixelFormat;
+  (*Info)->PixelInformation.RedMask = This->Mode->Info->PixelInformation.RedMask;
+  (*Info)->PixelInformation.GreenMask = This->Mode->Info->PixelInformation.GreenMask;
+  (*Info)->PixelInformation.BlueMask = This->Mode->Info->PixelInformation.BlueMask;
+  (*Info)->PixelInformation.ReservedMask = This->Mode->Info->PixelInformation.ReservedMask;
   (*Info)->PixelsPerScanLine = Mode->Width;
 
   return EFI_SUCCESS;