Reviewed-by: Andrei Warkentin ________________________________ From: Samer El-Haj-Mahmoud Sent: Tuesday, September 29, 2020 12:48 PM To: devel@edk2.groups.io Cc: Leif Lindholm ; Ard Biesheuvel ; Pete Batard ; Andrei Warkentin Subject: [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix incorrect display resolution Fix https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fpftf%2FRPi4%2Fissues%2F100&data=02%7C01%7Cawarkentin%40vmware.com%7Cfdea6fe1fe784911d1bb08d8649fea08%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637369985285682403&sdata=I4v5OWaFged21AdowwKFyqordByL2YTf2iD9%2BjLhDLY%3D&reserved=0 by swapping RPi DisplayDxe resolution settings for 640x480 and 800x600, which were incorrectly mapped to the settings shown in the Setup configuration variable. Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Pete Batard Cc: Andrei Warkentin Signed-off-by: Samer El-Haj-Mahmoud --- Platform/RaspberryPi/Include/ConfigVars.h | 2 +- Platform/RaspberryPi/RPi3/Readme.md | 4 ++-- Platform/RaspberryPi/RPi4/Readme.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Platform/RaspberryPi/Include/ConfigVars.h b/Platform/RaspberryPi/Include/ConfigVars.h index 8094d4ef9ab9..c185bfe28b55 100644 --- a/Platform/RaspberryPi/Include/ConfigVars.h +++ b/Platform/RaspberryPi/Include/ConfigVars.h @@ -19,8 +19,8 @@ typedef struct { * * 800x600, 640x480, 1024x768, 720p, 1080p, native. */ - UINT8 v640 : 1; UINT8 v800 : 1; + UINT8 v640 : 1; UINT8 v1024 : 1; UINT8 v720p : 1; UINT8 v1080p : 1; diff --git a/Platform/RaspberryPi/RPi3/Readme.md b/Platform/RaspberryPi/RPi3/Readme.md index 9080cff15841..3b1171a27c3b 100644 --- a/Platform/RaspberryPi/RPi3/Readme.md +++ b/Platform/RaspberryPi/RPi3/Readme.md @@ -226,8 +226,8 @@ UEFI Setting | NAME | VALUE CPU Clock | `CpuClock` | Low = `0x00000000`
Default = `0x00000001` (default)
Max = `0x00000002`
Custom = `0x00000003` CPU Clock Rate (MHz) | `CustomCpuClock` | Hex numeric value, 4-bytes
(e.g. `0x000005DC` for 1500 MHz) **Display Configuration** | -Virtual 640x480 | `DisplayEnableScaledVModes` | Checked = Bit 0 set (i.e. ` \| 0x01`) -Virtual 800x600 | `DisplayEnableScaledVModes` | Checked = Bit 1 set (i.e. ` \| 0x02`) +Virtual 640x480 | `DisplayEnableScaledVModes` | Checked = Bit 1 set (i.e. ` \| 0x02`) +Virtual 800x600 | `DisplayEnableScaledVModes` | Checked = Bit 0 set (i.e. ` \| 0x01`) Virtual 1024x768 | `DisplayEnableScaledVModes` | Checked = Bit 2 set (i.e. ` \| 0x04`) Virtual 720p | `DisplayEnableScaledVModes` | Checked = Bit 3 set (i.e. ` \| 0x08`) Virtual 1080p | `DisplayEnableScaledVModes` | Checked = Bit 4 set (i.e. ` \| 0x10`) diff --git a/Platform/RaspberryPi/RPi4/Readme.md b/Platform/RaspberryPi/RPi4/Readme.md index 98388e3caba1..3b2ed44e3c38 100644 --- a/Platform/RaspberryPi/RPi4/Readme.md +++ b/Platform/RaspberryPi/RPi4/Readme.md @@ -169,8 +169,8 @@ UEFI Setting | NAME | VALUE CPU Clock | `CpuClock` | Low = `0x00000000`
Default = `0x00000001` (default)
Max = `0x00000002`
Custom = `0x00000003` CPU Clock Rate (MHz) | `CustomCpuClock` | Hex numeric value, 4-bytes
(e.g. `0x000005DC` for 1500 MHz) **Display Configuration** | -Virtual 640x480 | `DisplayEnableScaledVModes` | Checked = Bit 0 set (i.e. ` \| 0x01`) -Virtual 800x600 | `DisplayEnableScaledVModes` | Checked = Bit 1 set (i.e. ` \| 0x02`) +Virtual 640x480 | `DisplayEnableScaledVModes` | Checked = Bit 1 set (i.e. ` \| 0x02`) +Virtual 800x600 | `DisplayEnableScaledVModes` | Checked = Bit 0 set (i.e. ` \| 0x01`) Virtual 1024x768 | `DisplayEnableScaledVModes` | Checked = Bit 2 set (i.e. ` \| 0x04`) Virtual 720p | `DisplayEnableScaledVModes` | Checked = Bit 3 set (i.e. ` \| 0x08`) Virtual 1080p | `DisplayEnableScaledVModes` | Checked = Bit 4 set (i.e. ` \| 0x10`) -- 2.17.1