From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.58]) by mx.groups.io with SMTP id smtpd.web11.15326.1604508715782687459 for ; Wed, 04 Nov 2020 08:51:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@vmware.com header.s=selector2 header.b=JftR9IYs; spf=pass (domain: vmware.com, ip: 40.107.237.58, mailfrom: awarkentin@vmware.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ljIBILt5kmYV/ey3WnBcbcSYOEf56V7ZP6zgGo6eOZL1LzcZmX3BLPrT+Y3mvvmQ607JA9m/Jce/oNz7Mq9UkkfOqWgzHqWuVZOON+FDBJPBaH7hlVjhtzfS95EXwVogZm2iFlfemgn0M9JKgeakS8wITSBeRgft6n/I3ak8U3rBqG3P+LK8XgloNyAvby1rSwq+eJkSvbI4fxuN+nFg2DaOQQF+NRbo+RTXGWXwYpNCtsVSn4TDS0vOxMIwpmYCbgfsSnHgC7AweCyRHQ0UP+p2VmkLs8oPNd6STYoldE25XEQdwWiFcU5au6Ai2QHvmSwEazc/P8u8uHDs6ewEHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K1kS43aFa+Mc5q601QAvC2ZYlqNEadPIKJ1iz/de9S4=; b=HoBc8xyDqLUPisq7FsffSUMu4kRAck43RB0seH2lI+7a43VcyjMdZ2X3kfymbeyBMeDGs7VSUmnWSYmqaqqsGLD3b33AtZm4RJCyXkhBhA2KBNFe/+zcN66wj3UclBtkkakwty3orbhG97CPpf4WeOpEVVuk3vmGXhrj+frXb/6i7OSkZrBRnzLGoGj1UsiPRGPnp4Z+/K6c+LrGfd/QDFqh3Pdgj0ltFe3OoSheQc+koOMCn9unpcacKLgFoXnRBe5cON3f6001CYelb/oWCSuolvhNRCf0rbIiURGJ92E5KwpxsSNA7pEbHJpoDoxj0CHuUWS1j/6D/598wnxbmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K1kS43aFa+Mc5q601QAvC2ZYlqNEadPIKJ1iz/de9S4=; b=JftR9IYsm88MAR3xqqWkcqWxVu9hTpjsOmve3F4eVVs8s70SMyAXNqMf6AXxq8MkDpC5aFG/F3vAbnw6mcIAQZX1s08lVnTMWMLJ1wvQZlh8IFSapE6H8VdoNI2ibw2ReQjwkDd/4pm0qoyRjMKMsnxfBGF9UOQYOoR4HVkaSvU= Received: from BN6PR05MB3411.namprd05.prod.outlook.com (2603:10b6:405:43::23) by BN3PR05MB2497.namprd05.prod.outlook.com (2a01:111:e400:7bb6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.10; Wed, 4 Nov 2020 16:51:51 +0000 Received: from BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::b03c:e0bf:2c43:f362]) by BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::b03c:e0bf:2c43:f362%2]) with mapi id 15.20.3541.015; Wed, 4 Nov 2020 16:51:50 +0000 From: "Andrei Warkentin" To: Samer El-Haj-Mahmoud , "devel@edk2.groups.io" CC: Leif Lindholm , Ard Biesheuvel , Pete Batard Subject: Re: [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix incorrect display resolution Thread-Topic: [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix incorrect display resolution Thread-Index: AQHWlojJmcd+EAgoIESYuY/6bqwEa6m4aFPl Date: Wed, 4 Nov 2020 16:51:50 +0000 Message-ID: References: <20200929174830.4955-1-Samer.El-Haj-Mahmoud@arm.com> In-Reply-To: <20200929174830.4955-1-Samer.El-Haj-Mahmoud@arm.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=vmware.com; x-originating-ip: [98.214.99.181] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c46b6e2f-7ed1-4389-125f-08d880e1ed42 x-ms-traffictypediagnostic: BN3PR05MB2497: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3826; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +3dUF1Vcc0pW5DLvX62xYE2q7akFTlRzb/grPLzbPn0tEi+GMXl2kwDPM7t/W+gGIf7z+ixae2wxWDWxgeyre1EEow2zrcLscpSbxdlId9+fX76UufY239Hcph9h1TT0WB/W+YbszsaF7osPgeP8jATvfY5A7WWuxVGuc1L5cTX+PJ4UP74cYLIuudcZl3Q7FDkv2D6INETG51xz6EDuH2vnDOaoqIywSvLE7uwXsdrn0Rmo/XuIOtMtXzpr94mcCyVRLO2m7eVkJ+bhVujk53SPgo1a1rmO3fYLFRKPqL3h4vUpV959rRaz3h/FeEp1P01HbySA1ZkrGuI5naSKBBPffmIvDtUYIdLu9Jh7Ij9YLoF3nltxurhgyNhPcVygbzbUYVOljQxzakc/tJFXYQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR05MB3411.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(366004)(376002)(346002)(396003)(966005)(64756008)(4326008)(66476007)(478600001)(71200400001)(45080400002)(8676002)(26005)(54906003)(186003)(110136005)(7696005)(76116006)(66946007)(66446008)(316002)(19627235002)(8936002)(66556008)(2906002)(86362001)(19627405001)(5660300002)(52536014)(166002)(83380400001)(9686003)(53546011)(6506007)(55016002)(33656002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: 2ny4x3epCoUBsB8MPOjVUHOeZRAGXbjeRpPV6oh4Ej7yzGNLkNO3qFniWCdnJ75N0LXZ3i840EWx2kE8PdX3OlTt3aN1B5H7Whiinu7xJUjbqS4odF97h/XTGjCQrtbNj8s925nEY1PwfyDP0w+oMwgqu28gnrRpusYgKqzxBlZrGNW+hXmZCa5+0PkFXAV9qC3VOEOe2OVuC3JlIAdqKI70adhwP0kw00vIWyH5JK1n3DrKYPMBZpWCOCtMs2+6EX5TcejUXCwn/rdovmm7zMOiK+ej0vqsA/2PlYq1c1zVsMknTH2P0K54TAEPYAoaLQKJqAEdM+RgKG8W8pbN0EVqLStI7iND6aTq4uO+iV8HeilOSzDQRbri/DvL3WlWH3YZCnJhjlNQPU/ZbUL0J0/UFSXHYcZzdqyYBAvwJAtprPjybXLfsfhNymTqkNsSvjdTCUoR7LqCUHcG2v19ztqoKmWa+EBWafPLjqT1UYIqTzdn4/mkJzc9XqtpXUYaChcvxS/sctW3sK3YQa0oMWxdMiy7Ti/alc2SlV7Vmpkfq05eTWlxb0PfxeQo9BsLZueyaYb71to6blqQFRpVavYnNGRwt1Kc3CYTG3k6HLVVy+kBrFjg3YyRRmMDrw4uzi1Byh6LSP2xCwZisLOxyg== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR05MB3411.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c46b6e2f-7ed1-4389-125f-08d880e1ed42 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Nov 2020 16:51:50.7623 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GmjEZP8hHrxdMkIEf8+v6BdlS+Tbduk36iM2thMg+GuMAzT9Azo3Dl7L3+uF7ReOb15hJd8QtMCAdi7+9favZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR05MB2497 Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_BN6PR05MB341121546FF4AFBDA4530412B9EF0BN6PR05MB3411namp_" --_000_BN6PR05MB341121546FF4AFBDA4530412B9EF0BN6PR05MB3411namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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=3Dhttps%3A%2F%2Fgit= hub.com%2Fpftf%2FRPi4%2Fissues%2F100&data=3D02%7C01%7Cawarkentin%40vmwa= re.com%7Cfdea6fe1fe784911d1bb08d8649fea08%7Cb39138ca3cee4b4aa4d6cd83d9dd62f= 0%7C0%7C1%7C637369985285682403&sdata=3DI4v5OWaFged21AdowwKFyqordByL2YTf= 2iD9%2BjLhDLY%3D&reserved=3D0 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/Raspberry= Pi/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/RPi= 3/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 =3D `0x00000000`
Defau= lt =3D `0x00000001` (default)
Max =3D `0x00000002`
Custom =3D `0x00= 000003` CPU Clock Rate (MHz) | `CustomCpuClock` | Hex numeric value, 4-byt= es
(e.g. `0x000005DC` for 1500 MHz) **Display Configuration** | -Virtual 640x480 | `DisplayEnableScaledVModes` | Checked =3D B= it 0 set (i.e. ` \| 0x01`) -Virtual 800x600 | `DisplayEnableScaledVModes` | Checked =3D B= it 1 set (i.e. ` \| 0x02`) +Virtual 640x480 | `DisplayEnableScaledVModes` | Checked =3D B= it 1 set (i.e. ` \| 0x02`) +Virtual 800x600 | `DisplayEnableScaledVModes` | Checked =3D B= it 0 set (i.e. ` \| 0x01`) Virtual 1024x768 | `DisplayEnableScaledVModes` | Checked =3D B= it 2 set (i.e. ` \| 0x04`) Virtual 720p | `DisplayEnableScaledVModes` | Checked =3D B= it 3 set (i.e. ` \| 0x08`) Virtual 1080p | `DisplayEnableScaledVModes` | Checked =3D B= it 4 set (i.e. ` \| 0x10`) diff --git a/Platform/RaspberryPi/RPi4/Readme.md b/Platform/RaspberryPi/RPi= 4/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 =3D `0x00000000`
Defau= lt =3D `0x00000001` (default)
Max =3D `0x00000002`
Custom =3D `0x00= 000003` CPU Clock Rate (MHz) | `CustomCpuClock` | Hex numeric value, 4-byt= es
(e.g. `0x000005DC` for 1500 MHz) **Display Configuration** | -Virtual 640x480 | `DisplayEnableScaledVModes` | Checked =3D B= it 0 set (i.e. ` \| 0x01`) -Virtual 800x600 | `DisplayEnableScaledVModes` | Checked =3D B= it 1 set (i.e. ` \| 0x02`) +Virtual 640x480 | `DisplayEnableScaledVModes` | Checked =3D B= it 1 set (i.e. ` \| 0x02`) +Virtual 800x600 | `DisplayEnableScaledVModes` | Checked =3D B= it 0 set (i.e. ` \| 0x01`) Virtual 1024x768 | `DisplayEnableScaledVModes` | Checked =3D B= it 2 set (i.e. ` \| 0x04`) Virtual 720p | `DisplayEnableScaledVModes` | Checked =3D B= it 3 set (i.e. ` \| 0x08`) Virtual 1080p | `DisplayEnableScaledVModes` | Checked =3D B= it 4 set (i.e. ` \| 0x10`) -- 2.17.1 --_000_BN6PR05MB341121546FF4AFBDA4530412B9EF0BN6PR05MB3411namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable
Reviewed-by: Andrei Warkentin <awarkentin@vmware.com>
From: Samer El-Haj-Mahmoud = <Samer.El-Haj-Mahmoud@arm.com>
Sent: Tuesday, September 29, 2020 12:48 PM
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Leif Lindholm <leif@nuviainc.com>; Ard Biesheuvel <ard.= biesheuvel@arm.com>; Pete Batard <pete@akeo.ie>; Andrei Warkentin = <awarkentin@vmware.com>
Subject: [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix in= correct display resolution
 
Fix https://nam04.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fgithub.= com%2Fpftf%2FRPi4%2Fissues%2F100&amp;data=3D02%7C01%7Cawarkentin%40vmwa= re.com%7Cfdea6fe1fe784911d1bb08d8649fea08%7Cb39138ca3cee4b4aa4d6cd83d9dd62f= 0%7C0%7C1%7C637369985285682403&amp;sdata=3DI4v5OWaFged21AdowwKFyqordByL= 2YTf2iD9%2BjLhDLY%3D&amp;reserved=3D0 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 <leif@nuviainc.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Pete Batard <pete@akeo.ie>
Cc: Andrei Warkentin <awarkentin@vmware.com>
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com> ---
 Platform/RaspberryPi/Include/ConfigVars.h | 2 +-
 Platform/RaspberryPi/RPi3/Readme.md     &nbs= p; | 4 ++--
 Platform/RaspberryPi/RPi4/Readme.md     &nbs= p; | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Platform/RaspberryPi/Include/ConfigVars.h b/Platform/Raspberry= Pi/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/RPi= 3/Readme.md
index 9080cff15841..3b1171a27c3b 100644
--- a/Platform/RaspberryPi/RPi3/Readme.md
+++ b/Platform/RaspberryPi/RPi3/Readme.md
@@ -226,8 +226,8 @@ UEFI Setting       &= nbsp;         |    N= AME            =    |  VALUE
 CPU Clock          =           | `CpuClock` | Low = =3D `0x00000000`<br> Default =3D `0x00000001` (default)<br> Max= =3D `0x00000002`<br> Custom =3D `0x00000003`
 CPU Clock Rate (MHz)         = | `CustomCpuClock` | Hex numeric value, 4-bytes<br> (e.g. `0x000005DC= ` for 1500 MHz)
 **Display Configuration**    |
-Virtual 640x480          = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 0 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x01`)
-Virtual 800x600          = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 1 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x02`)
+Virtual 640x480          = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 1 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x02`)
+Virtual 800x600          = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 0 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x01`)
 Virtual 1024x768         = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 2 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x04`)
 Virtual 720p         &nb= sp;       | `DisplayEnableScaledVModes` | Che= cked =3D Bit 3 set (i.e.  `<DisplayEnableScaledVModes> \| 0x08`)=
 Virtual 1080p         &n= bsp;      | `DisplayEnableScaledVModes` | Checked = =3D Bit 4 set (i.e.  `<DisplayEnableScaledVModes> \| 0x10`)
diff --git a/Platform/RaspberryPi/RPi4/Readme.md b/Platform/RaspberryPi/RPi= 4/Readme.md
index 98388e3caba1..3b2ed44e3c38 100644
--- a/Platform/RaspberryPi/RPi4/Readme.md
+++ b/Platform/RaspberryPi/RPi4/Readme.md
@@ -169,8 +169,8 @@ UEFI Setting       &= nbsp;         |    N= AME            =    |  VALUE
 CPU Clock          =           | `CpuClock` | Low = =3D `0x00000000`<br> Default =3D `0x00000001` (default)<br> Max= =3D `0x00000002`<br> Custom =3D `0x00000003`
 CPU Clock Rate (MHz)         = | `CustomCpuClock` | Hex numeric value, 4-bytes<br> (e.g. `0x000005DC= ` for 1500 MHz)
 **Display Configuration**    |
-Virtual 640x480          = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 0 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x01`)
-Virtual 800x600          = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 1 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x02`)
+Virtual 640x480          = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 1 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x02`)
+Virtual 800x600          = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 0 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x01`)
 Virtual 1024x768         = ;    | `DisplayEnableScaledVModes` | Checked =3D Bit 2 set (= i.e.  `<DisplayEnableScaledVModes> \| 0x04`)
 Virtual 720p         &nb= sp;       | `DisplayEnableScaledVModes` | Che= cked =3D Bit 3 set (i.e.  `<DisplayEnableScaledVModes> \| 0x08`)=
 Virtual 1080p         &n= bsp;      | `DisplayEnableScaledVModes` | Checked = =3D Bit 4 set (i.e.  `<DisplayEnableScaledVModes> \| 0x10`)
--
2.17.1

--_000_BN6PR05MB341121546FF4AFBDA4530412B9EF0BN6PR05MB3411namp_--