[PATCH 0/3] add and use more video modes

[PATCH 0/3] add and use more video modes

[Gerd Hoffmann]

Gerd Hoffmann (3):
  MdeModulePkg/GraphicsConsoleDxe: add modes
  OvmfPkg: clear PcdConOut{Row,Column}
  ArmVirtPkg: clear PcdConOut{Row,Column}

 ArmVirtPkg/ArmVirtQemu.dsc                                   | 2 ++
 ArmVirtPkg/ArmVirtQemuKernel.dsc                             | 2 ++
 OvmfPkg/AmdSev/AmdSevX64.dsc                                 | 2 ++
 OvmfPkg/Microvm/MicrovmX64.dsc                               | 2 ++
 OvmfPkg/OvmfPkgIa32.dsc                                      | 2 ++
 OvmfPkg/OvmfPkgIa32X64.dsc                                   | 2 ++
 OvmfPkg/OvmfPkgX64.dsc                                       | 2 ++
 OvmfPkg/OvmfXen.dsc                                          | 2 ++
 .../Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c   | 5 ++++-
 9 files changed, 20 insertions(+), 1 deletion(-)

-- 
2.35.1

[PATCH 1/3] MdeModulePkg/GraphicsConsoleDxe: add modes

[Gerd Hoffmann]

Add modes for a few common display resolutions higher than 800x600,
specifically 1024x768, 1280x800 and 1920x1080, so ConSplitterDxe has
more options available.

The mode list is not use as-is, InitializeGraphicsConsoleTextMode() will
check the list and filter out any modes which don't fit to the screen,
so this will also work fine for small displays.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 .../Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 07436cbd15bf..b895dafedeaa 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -40,7 +40,10 @@ GRAPHICS_CONSOLE_DEV  mGraphicsConsoleDevTemplate = {
 };
 
 GRAPHICS_CONSOLE_MODE_DATA  mGraphicsConsoleModeData[] = {
-  { 100, 31 },
+  { 100, 31 },  //  800 x 600
+  { 128, 40 },  // 1024 x 768
+  { 160, 42 },  // 1280 x 800
+  { 240, 56 },  // 1920 x 1080
   //
   // New modes can be added here.
   // The last entry is specific for full screen mode.
-- 
2.35.1

[PATCH 2/3] OvmfPkg: clear PcdConOut{Row,Column}

[Gerd Hoffmann]

ConSplitterDxe will pick the highest available resolution then,
thereby making better use of the available display space.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 OvmfPkg/AmdSev/AmdSevX64.dsc   | 2 ++
 OvmfPkg/Microvm/MicrovmX64.dsc | 2 ++
 OvmfPkg/OvmfPkgIa32.dsc        | 2 ++
 OvmfPkg/OvmfPkgIa32X64.dsc     | 2 ++
 OvmfPkg/OvmfPkgX64.dsc         | 2 ++
 OvmfPkg/OvmfXen.dsc            | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index fcdc3efab204..20ca8a709c1b 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -529,6 +529,8 @@ [PcdsDynamicDefault]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE
   gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 59580ccd4691..52816773969b 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -562,6 +562,8 @@ [PcdsDynamicDefault]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE
   gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index e4218b01f0fc..3dbbed37ccc8 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -592,6 +592,8 @@ [PcdsDynamicDefault]
 !endif
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE
   gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index a80cdaacb8bc..b98022d95a29 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -600,6 +600,8 @@ [PcdsDynamicDefault]
 !endif
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE
   gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index fb2899f8a1be..90cdf3959a09 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -611,6 +611,8 @@ [PcdsDynamicDefault]
 !endif
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE
   gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0
diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index 7bd594c6e263..34ed346a500f 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -469,6 +469,8 @@ [PcdsDynamicDefault]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE
   gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0
-- 
2.35.1

[PATCH 3/3] ArmVirtPkg: clear PcdConOut{Row,Column}

[Gerd Hoffmann]

ConSplitterDxe will pick the highest available resolution then,
thereby making better use of the available display space.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ArmVirtPkg/ArmVirtQemu.dsc       | 2 ++
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index b2b0d304d335..aa0ce61630f7 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -259,6 +259,8 @@ [PcdsDynamicDefault.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
 
   #
   # SMBIOS entry point version
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 36343f347bab..7f7d15d6eee3 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -238,6 +238,8 @@ [PcdsDynamicDefault.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
 
   #
   # SMBIOS entry point version
-- 
2.35.1

回复: [edk2-devel] [PATCH 1/3] MdeModulePkg/GraphicsConsoleDxe: add modes

[gaoliming]

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn> for this patch serials. 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Gerd
> Hoffmann
> 发送时间: 2022年4月7日 19:36
> 收件人: devel@edk2.groups.io
> 抄送: Erdem Aktas <erdemaktas@google.com>; Sami Mujawar
> <sami.mujawar@arm.com>; Julien Grall <julien@xen.org>; James Bottomley
> <jejb@linux.ibm.com>; Anthony Perard <anthony.perard@citrix.com>; Min Xu
> <min.m.xu@intel.com>; Gerd Hoffmann <kraxel@redhat.com>; Oliver Steffen
> <osteffen@redhat.com>; Ray Ni <ray.ni@intel.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Jordan Justen <jordan.l.justen@intel.com>;
> Jian J Wang <jian.j.wang@intel.com>; Tom Lendacky
> <thomas.lendacky@amd.com>; Brijesh Singh <brijesh.singh@amd.com>;
> Jiewen Yao <jiewen.yao@intel.com>; Leif Lindholm
> <quic_llindhol@quicinc.com>; Liming Gao <gaoliming@byosoft.com.cn>;
> Zhichao Gao <zhichao.gao@intel.com>; Pawel Polawski
> <ppolawsk@redhat.com>
> 主题: [edk2-devel] [PATCH 1/3] MdeModulePkg/GraphicsConsoleDxe: add
> modes
> 
> Add modes for a few common display resolutions higher than 800x600,
> specifically 1024x768, 1280x800 and 1920x1080, so ConSplitterDxe has
> more options available.
> 
> The mode list is not use as-is, InitializeGraphicsConsoleTextMode() will
> check the list and filter out any modes which don't fit to the screen,
> so this will also work fine for small displays.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  .../Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c   | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git
> a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.
> c
> b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.
> c
> index 07436cbd15bf..b895dafedeaa 100644
> ---
> a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.
> c
> +++
> b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.
> c
> @@ -40,7 +40,10 @@ GRAPHICS_CONSOLE_DEV
> mGraphicsConsoleDevTemplate = {
>  };
> 
>  GRAPHICS_CONSOLE_MODE_DATA  mGraphicsConsoleModeData[] = {
> -  { 100, 31 },
> +  { 100, 31 },  //  800 x 600
> +  { 128, 40 },  // 1024 x 768
> +  { 160, 42 },  // 1280 x 800
> +  { 240, 56 },  // 1920 x 1080
>    //
>    // New modes can be added here.
>    // The last entry is specific for full screen mode.
> --
> 2.35.1
> 
> 
> 
> 
>