Fix https://github.com/pftf/RPi4/issues/100 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 <l...@nuviainc.com>
Cc: Ard Biesheuvel <ard.biesheu...@arm.com>
Cc: Pete Batard <p...@akeo.ie>
Cc: Andrei Warkentin <awarken...@vmware.com>
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahm...@arm.com>
---
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`<br> Default =
`0x00000001` (default)<br> Max = `0x00000002`<br> Custom = `0x00000003`
CPU Clock Rate (MHz) | `CustomCpuClock` | Hex numeric value,
4-bytes<br> (e.g. `0x000005DC` for 1500 MHz)
**Display Configuration** |
-Virtual 640x480 | `DisplayEnableScaledVModes` | Checked = Bit 0
set (i.e. `<DisplayEnableScaledVModes> \| 0x01`)
-Virtual 800x600 | `DisplayEnableScaledVModes` | Checked = Bit 1
set (i.e. `<DisplayEnableScaledVModes> \| 0x02`)
+Virtual 640x480 | `DisplayEnableScaledVModes` | Checked = Bit 1
set (i.e. `<DisplayEnableScaledVModes> \| 0x02`)
+Virtual 800x600 | `DisplayEnableScaledVModes` | Checked = Bit 0
set (i.e. `<DisplayEnableScaledVModes> \| 0x01`)
Virtual 1024x768 | `DisplayEnableScaledVModes` | Checked = Bit 2
set (i.e. `<DisplayEnableScaledVModes> \| 0x04`)
Virtual 720p | `DisplayEnableScaledVModes` | Checked = Bit 3
set (i.e. `<DisplayEnableScaledVModes> \| 0x08`)
Virtual 1080p | `DisplayEnableScaledVModes` | Checked = Bit 4
set (i.e. `<DisplayEnableScaledVModes> \| 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`<br> Default =
`0x00000001` (default)<br> Max = `0x00000002`<br> Custom = `0x00000003`
CPU Clock Rate (MHz) | `CustomCpuClock` | Hex numeric value,
4-bytes<br> (e.g. `0x000005DC` for 1500 MHz)
**Display Configuration** |
-Virtual 640x480 | `DisplayEnableScaledVModes` | Checked = Bit 0
set (i.e. `<DisplayEnableScaledVModes> \| 0x01`)
-Virtual 800x600 | `DisplayEnableScaledVModes` | Checked = Bit 1
set (i.e. `<DisplayEnableScaledVModes> \| 0x02`)
+Virtual 640x480 | `DisplayEnableScaledVModes` | Checked = Bit 1
set (i.e. `<DisplayEnableScaledVModes> \| 0x02`)
+Virtual 800x600 | `DisplayEnableScaledVModes` | Checked = Bit 0
set (i.e. `<DisplayEnableScaledVModes> \| 0x01`)
Virtual 1024x768 | `DisplayEnableScaledVModes` | Checked = Bit 2
set (i.e. `<DisplayEnableScaledVModes> \| 0x04`)
Virtual 720p | `DisplayEnableScaledVModes` | Checked = Bit 3
set (i.e. `<DisplayEnableScaledVModes> \| 0x08`)
Virtual 1080p | `DisplayEnableScaledVModes` | Checked = Bit 4
set (i.e. `<DisplayEnableScaledVModes> \| 0x10`)
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#65732): https://edk2.groups.io/g/devel/message/65732
Mute This Topic: https://groups.io/mt/77201777/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
