[PATCH V4 0/2] MdeModulePkg: Make the screen seamless

[PATCH V4 0/2] MdeModulePkg: Make the screen seamless

[Gao, Zhichao]

For now most platforms support display function at PEI phase.
But the conspliter and graphics console driver would clear the
screen at BDS connect console phase. Maybe some platforms would
show logo in the next or maybe not. For consumers, it looks like
the screen flashed.
So change the behavior of graphics console devices while connect
console devices to maintain seamless screen from PEI.

Test has done on MinPlatform Kabylake-RVP3 which support PEI
display.

V2:
Make the SetMode not clear the screen only at the first boot during
the first conncettion of graphics device.

V3:
Abandon V2. Directly set the output mode without clear the screen
while initialize the graphics console device. Add clear screen operation
in stop function of graphics console device.

V4:
Fix incorrect mode check in V3.
Initialize the mode to an invalid mode. If no perfer mode is found, it
is better to initialize its text mode to an invalid one.
Remove the ClearScreen fuction in the BindingStop function in V3.
The graphics output driver may disconnect before graphics console, that
may cause a system exception because of using released resource.
Impact: the screen would not be cleared after reconnect the graphics device
thru software, such as 'reconnect -r' in shell.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Laszlo Ersek <lersek@redhat.com>

Aaron Antone (1):
  MdeModulePkg/ConSplitterDxe: Optimize the ConSplitterTextOutSetMode

Zhichao Gao (1):
  MdeModulePkg/GraphicsConsoleDxe: Initialize the output mode

 .../Console/ConSplitterDxe/ConSplitter.c      | 33 ++++++++++-----
 .../Console/ConSplitterDxe/ConSplitter.h      |  4 +-
 .../GraphicsConsoleDxe/GraphicsConsole.c      | 42 ++++++++++++++-----
 .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf |  2 +
 4 files changed, 59 insertions(+), 22 deletions(-)

-- 
2.21.0.windows.1

[PATCH V4 1/2] MdeModulePkg/ConSplitterDxe: Optimize the ConSplitterTextOutSetMode

[Gao, Zhichao]

From: Aaron Antone <aanton@microsoft.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1412

For Console Out device, it would always set all present devices'
text out mode again through ConSplitterTextOutSetMode while adding
devices. That may cause the screen cleared for serval times.
So add a BOOLEAN to judge if it is adding device then we will not
set the same text mode again for same console out device.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 .../Console/ConSplitterDxe/ConSplitter.c      | 33 ++++++++++++-------
 .../Console/ConSplitterDxe/ConSplitter.h      |  4 ++-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 6fc0e4796f..5de022b02a 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -16,7 +16,7 @@
   never removed. Such design ensures sytem function well during none console
   device situation.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -180,7 +180,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
   0,
   (TEXT_OUT_SPLITTER_QUERY_DATA *) NULL,
   0,
-  (INT32 *) NULL
+  (INT32 *) NULL,
+  FALSE
 };
 
 //
@@ -235,7 +236,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {
   0,
   (TEXT_OUT_SPLITTER_QUERY_DATA *) NULL,
   0,
-  (INT32 *) NULL
+  (INT32 *) NULL,
+  FALSE
 };
 
 //
@@ -3132,8 +3134,9 @@ ConSplitterTextOutAddDevice (
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;
   EFI_STATUS                           DeviceStatus;
 
-  Status                = EFI_SUCCESS;
-  CurrentNumOfConsoles  = Private->CurrentNumberOfConsoles;
+  Status                      = EFI_SUCCESS;
+  CurrentNumOfConsoles        = Private->CurrentNumberOfConsoles;
+  Private->AddingConOutDevice = TRUE;
 
   //
   // If the Text Out List is full, enlarge it by calling ConSplitterGrowBuffer().
@@ -3290,6 +3293,8 @@ ConSplitterTextOutAddDevice (
   //
   ConsplitterSetConsoleOutMode (Private);
 
+  Private->AddingConOutDevice = FALSE;
+
   return Status;
 }
 
@@ -4849,12 +4854,18 @@ ConSplitterTextOutSetMode (
   //
   TextOutModeMap = Private->TextOutModeMap + Private->TextOutListCount * ModeNumber;
   for (Index = 0, ReturnStatus = EFI_SUCCESS; Index < Private->CurrentNumberOfConsoles; Index++) {
-    Status = Private->TextOutList[Index].TextOut->SetMode (
-                                                    Private->TextOutList[Index].TextOut,
-                                                    TextOutModeMap[Index]
-                                                    );
-    if (EFI_ERROR (Status)) {
-      ReturnStatus = Status;
+    //
+    // While adding a console out device do not set same mode again for the same device.
+    //
+    if ((Private->AddingConOutDevice != TRUE) ||
+        (TextOutModeMap[Index] != Private->TextOutList[Index].TextOut->Mode->Mode)) {
+      Status = Private->TextOutList[Index].TextOut->SetMode (
+                                                      Private->TextOutList[Index].TextOut,
+                                                      TextOutModeMap[Index]
+                                                      );
+      if (EFI_ERROR (Status)) {
+        ReturnStatus = Status;
+      }
     }
   }
 
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index e9b68e58c6..419635c3f5 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -1,7 +1,7 @@
 /** @file
   Private data structures for the Console Splitter driver
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -218,6 +218,8 @@ typedef struct {
   UINTN                                 TextOutQueryDataCount;
   INT32                                 *TextOutModeMap;
 
+  BOOLEAN                               AddingConOutDevice;
+
 } TEXT_OUT_SPLITTER_PRIVATE_DATA;
 
 #define TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \
-- 
2.21.0.windows.1

[PATCH V4 2/2] MdeModulePkg/GraphicsConsoleDxe: Initialize the output mode

[Gao, Zhichao]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1412

Original logic:
Connect the graphics device -> connect it as graphics consoles
and initialize its parameters(Mode = -1, invalid) -> connect it
as console spliter and add the device to the list(use SetMode to
set mode to the user defined mode or the best mode the devices
supported if the mode is invalid. *clear the screen at this phase*)

Changed logic:
Connect the graphics device -> connect it as graphics consoles
and initialize its parameters(initialize the mode to the user
defined mode or the best mode. *directly set the mode value without
using SetMode, that would not clear the screen) -> connect it as
console spliter and add the device to the list(use SetMode to set
mode to the user defined mode or the best mode the devices supported
if the mode is invalid. *now the mode is already set, so it would
not clear the screen*).

Also remove the section of SetMode for debug version.

Impact: as the text mode may not be an invalid value, the SetMode
may have no chance to be called during reconnect the graphics device.
That means the screen may not be cleaned after finishing reconnect
operation. There is one common condition: shell command "recoonect -r".

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 .../GraphicsConsoleDxe/GraphicsConsole.c      | 42 ++++++++++++++-----
 .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf |  2 +
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 26ea19f300..c042451a9b 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -1,7 +1,7 @@
 /** @file
   This is the main routine for initializing the Graphics Console support routines.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -384,6 +384,12 @@ GraphicsConsoleControllerDriverStart (
   EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE    *Mode;
   UINTN                                SizeOfInfo;
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;
+  INT32                                PreferMode;
+  INT32                                Index;
+  UINTN                                Column;
+  UINTN                                Row;
+  UINTN                                DefaultColumn;
+  UINTN                                DefaultRow;
 
   ModeNumber = 0;
 
@@ -567,16 +573,32 @@ GraphicsConsoleControllerDriverStart (
   //
   Private->SimpleTextOutputMode.MaxMode = (INT32) MaxMode;
 
-  DEBUG_CODE_BEGIN ();
-    Status = GraphicsConsoleConOutSetMode (&Private->SimpleTextOutput, 0);
-    if (EFI_ERROR (Status)) {
-      goto Error;
-    }
-    Status = GraphicsConsoleConOutOutputString (&Private->SimpleTextOutput, (CHAR16 *)L"Graphics Console Started\n\r");
-    if (EFI_ERROR (Status)) {
-      goto Error;
+  //
+  // Initialize the Mode of graphics console devices
+  //
+  PreferMode = -1;
+  DefaultColumn = PcdGet32 (PcdConOutColumn);
+  DefaultRow = PcdGet32 (PcdConOutRow);
+  Column = 0;
+  Row = 0;
+  for (Index = 0; Index < (INT32)MaxMode; Index++) {
+    if (DefaultColumn != 0 && DefaultRow != 0) {
+      if ((Private->ModeData[Index].Columns == DefaultColumn) &&
+          (Private->ModeData[Index].Rows == DefaultRow)) {
+        PreferMode = Index;
+        break;
+      }
+    } else {
+      if ((Private->ModeData[Index].Columns > Column) &&
+          (Private->ModeData[Index].Rows > Row)) {
+        Column = Private->ModeData[Index].Columns;
+        Row = Private->ModeData[Index].Rows;
+        PreferMode = Index;
+      }
     }
-  DEBUG_CODE_END ();
+  }
+  Private->SimpleTextOutput.Mode->Mode = (INT32)PreferMode;
+  DEBUG ((DEBUG_INFO, "Graphics Console Started, Mode: %d\n", PreferMode));
 
   //
   // Install protocol interfaces for the Graphics Console device.
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index f7caa65aa9..bcfd306eee 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -65,6 +65,8 @@
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution   ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow                 ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn              ## SOMETIMES_CONSUMES
 
 [UserExtensions.TianoCore."ExtraFiles"]
   GraphicsConsoleDxeExtra.uni
-- 
2.21.0.windows.1

Re: [PATCH V4 2/2] MdeModulePkg/GraphicsConsoleDxe: Initialize the output mode

[Laszlo Ersek]

On 05/24/19 04:40, Zhichao Gao wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1412
> 
> Original logic:
> Connect the graphics device -> connect it as graphics consoles
> and initialize its parameters(Mode = -1, invalid) -> connect it
> as console spliter and add the device to the list(use SetMode to
> set mode to the user defined mode or the best mode the devices
> supported if the mode is invalid. *clear the screen at this phase*)
> 
> Changed logic:
> Connect the graphics device -> connect it as graphics consoles
> and initialize its parameters(initialize the mode to the user
> defined mode or the best mode. *directly set the mode value without
> using SetMode, that would not clear the screen) -> connect it as
> console spliter and add the device to the list(use SetMode to set
> mode to the user defined mode or the best mode the devices supported
> if the mode is invalid. *now the mode is already set, so it would
> not clear the screen*).
> 
> Also remove the section of SetMode for debug version.
> 
> Impact: as the text mode may not be an invalid value, the SetMode
> may have no chance to be called during reconnect the graphics device.
> That means the screen may not be cleaned after finishing reconnect
> operation. There is one common condition: shell command "recoonect -r".
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Turner <Michael.Turner@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
>  .../GraphicsConsoleDxe/GraphicsConsole.c      | 42 ++++++++++++++-----
>  .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf |  2 +
>  2 files changed, 34 insertions(+), 10 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
> index 26ea19f300..c042451a9b 100644
> --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
> +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This is the main routine for initializing the Graphics Console support routines.
>  
> -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
>  
>  **/
> @@ -384,6 +384,12 @@ GraphicsConsoleControllerDriverStart (
>    EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE    *Mode;
>    UINTN                                SizeOfInfo;
>    EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;
> +  INT32                                PreferMode;
> +  INT32                                Index;
> +  UINTN                                Column;
> +  UINTN                                Row;
> +  UINTN                                DefaultColumn;
> +  UINTN                                DefaultRow;
>  
>    ModeNumber = 0;
>  
> @@ -567,16 +573,32 @@ GraphicsConsoleControllerDriverStart (
>    //
>    Private->SimpleTextOutputMode.MaxMode = (INT32) MaxMode;
>  
> -  DEBUG_CODE_BEGIN ();
> -    Status = GraphicsConsoleConOutSetMode (&Private->SimpleTextOutput, 0);
> -    if (EFI_ERROR (Status)) {
> -      goto Error;
> -    }
> -    Status = GraphicsConsoleConOutOutputString (&Private->SimpleTextOutput, (CHAR16 *)L"Graphics Console Started\n\r");
> -    if (EFI_ERROR (Status)) {
> -      goto Error;
> +  //
> +  // Initialize the Mode of graphics console devices
> +  //
> +  PreferMode = -1;
> +  DefaultColumn = PcdGet32 (PcdConOutColumn);
> +  DefaultRow = PcdGet32 (PcdConOutRow);
> +  Column = 0;
> +  Row = 0;
> +  for (Index = 0; Index < (INT32)MaxMode; Index++) {
> +    if (DefaultColumn != 0 && DefaultRow != 0) {
> +      if ((Private->ModeData[Index].Columns == DefaultColumn) &&
> +          (Private->ModeData[Index].Rows == DefaultRow)) {
> +        PreferMode = Index;
> +        break;
> +      }
> +    } else {
> +      if ((Private->ModeData[Index].Columns > Column) &&
> +          (Private->ModeData[Index].Rows > Row)) {
> +        Column = Private->ModeData[Index].Columns;
> +        Row = Private->ModeData[Index].Rows;
> +        PreferMode = Index;
> +      }
>      }
> -  DEBUG_CODE_END ();
> +  }
> +  Private->SimpleTextOutput.Mode->Mode = (INT32)PreferMode;
> +  DEBUG ((DEBUG_INFO, "Graphics Console Started, Mode: %d\n", PreferMode));
>  
>    //
>    // Install protocol interfaces for the Graphics Console device.
> diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> index f7caa65aa9..bcfd306eee 100644
> --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> @@ -65,6 +65,8 @@
>  [Pcd]
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## SOMETIMES_CONSUMES
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution   ## SOMETIMES_CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow                 ## SOMETIMES_CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn              ## SOMETIMES_CONSUMES
>  
>  [UserExtensions.TianoCore."ExtraFiles"]
>    GraphicsConsoleDxeExtra.uni
> 

Acked-by: Laszlo Ersek <lersek@redhat.com>

Re: [PATCH V4 1/2] MdeModulePkg/ConSplitterDxe: Optimize the ConSplitterTextOutSetMode

[Wu, Hao A]

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Friday, May 24, 2019 10:40 AM
> To: devel@edk2.groups.io
> Cc: Aaron Antone; Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star; Gao, Liming;
> Sean Brogan; Michael Turner; Bret Barkelew
> Subject: [PATCH V4 1/2] MdeModulePkg/ConSplitterDxe: Optimize the
> ConSplitterTextOutSetMode
> 
> From: Aaron Antone <aanton@microsoft.com>
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1412
> 
> For Console Out device, it would always set all present devices'
> text out mode again through ConSplitterTextOutSetMode while adding
> devices. That may cause the screen cleared for serval times.
> So add a BOOLEAN to judge if it is adding device then we will not
> set the same text mode again for same console out device.
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Turner <Michael.Turner@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
>  .../Console/ConSplitterDxe/ConSplitter.c      | 33 ++++++++++++-------
>  .../Console/ConSplitterDxe/ConSplitter.h      |  4 ++-
>  2 files changed, 25 insertions(+), 12 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
> b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
> index 6fc0e4796f..5de022b02a 100644
> --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
> +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
> @@ -16,7 +16,7 @@
>    never removed. Such design ensures sytem function well during none
> console
>    device situation.
> 
> -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
>  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> @@ -180,7 +180,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED
> TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
>    0,
>    (TEXT_OUT_SPLITTER_QUERY_DATA *) NULL,
>    0,
> -  (INT32 *) NULL
> +  (INT32 *) NULL,
> +  FALSE
>  };
> 
>  //
> @@ -235,7 +236,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED
> TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {
>    0,
>    (TEXT_OUT_SPLITTER_QUERY_DATA *) NULL,
>    0,
> -  (INT32 *) NULL
> +  (INT32 *) NULL,
> +  FALSE
>  };
> 
>  //
> @@ -3132,8 +3134,9 @@ ConSplitterTextOutAddDevice (
>    EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;
>    EFI_STATUS                           DeviceStatus;
> 
> -  Status                = EFI_SUCCESS;
> -  CurrentNumOfConsoles  = Private->CurrentNumberOfConsoles;
> +  Status                      = EFI_SUCCESS;
> +  CurrentNumOfConsoles        = Private->CurrentNumberOfConsoles;
> +  Private->AddingConOutDevice = TRUE;
> 
>    //
>    // If the Text Out List is full, enlarge it by calling ConSplitterGrowBuffer().
> @@ -3290,6 +3293,8 @@ ConSplitterTextOutAddDevice (
>    //
>    ConsplitterSetConsoleOutMode (Private);
> 
> +  Private->AddingConOutDevice = FALSE;
> +
>    return Status;
>  }
> 
> @@ -4849,12 +4854,18 @@ ConSplitterTextOutSetMode (
>    //
>    TextOutModeMap = Private->TextOutModeMap + Private-
> >TextOutListCount * ModeNumber;
>    for (Index = 0, ReturnStatus = EFI_SUCCESS; Index < Private-
> >CurrentNumberOfConsoles; Index++) {
> -    Status = Private->TextOutList[Index].TextOut->SetMode (
> -                                                    Private->TextOutList[Index].TextOut,
> -                                                    TextOutModeMap[Index]
> -                                                    );
> -    if (EFI_ERROR (Status)) {
> -      ReturnStatus = Status;
> +    //
> +    // While adding a console out device do not set same mode again for the
> same device.
> +    //
> +    if ((Private->AddingConOutDevice != TRUE) ||

Just a minor comment.

BOOLEAN type does not need to be explicitly compared with 'TRUE' or 'FALSE':
  if ((!Private->AddingConOutDevice) ||

With the above handled,
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu

> +        (TextOutModeMap[Index] != Private->TextOutList[Index].TextOut-
> >Mode->Mode)) {
> +      Status = Private->TextOutList[Index].TextOut->SetMode (
> +                                                      Private->TextOutList[Index].TextOut,
> +                                                      TextOutModeMap[Index]
> +                                                      );
> +      if (EFI_ERROR (Status)) {
> +        ReturnStatus = Status;
> +      }
>      }
>    }
> 
> diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
> b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
> index e9b68e58c6..419635c3f5 100644
> --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
> +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Private data structures for the Console Splitter driver
> 
> -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -218,6 +218,8 @@ typedef struct {
>    UINTN                                 TextOutQueryDataCount;
>    INT32                                 *TextOutModeMap;
> 
> +  BOOLEAN                               AddingConOutDevice;
> +
>  } TEXT_OUT_SPLITTER_PRIVATE_DATA;
> 
>  #define TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \
> --
> 2.21.0.windows.1

Re: [PATCH V4 2/2] MdeModulePkg/GraphicsConsoleDxe: Initialize the output mode

[Wu, Hao A]

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Friday, May 24, 2019 10:40 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star; Gao, Liming; Sean Brogan;
> Michael Turner; Bret Barkelew; Laszlo Ersek
> Subject: [PATCH V4 2/2] MdeModulePkg/GraphicsConsoleDxe: Initialize the
> output mode
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1412
> 
> Original logic:
> Connect the graphics device -> connect it as graphics consoles
> and initialize its parameters(Mode = -1, invalid) -> connect it
> as console spliter and add the device to the list(use SetMode to
> set mode to the user defined mode or the best mode the devices
> supported if the mode is invalid. *clear the screen at this phase*)
> 
> Changed logic:
> Connect the graphics device -> connect it as graphics consoles
> and initialize its parameters(initialize the mode to the user
> defined mode or the best mode. *directly set the mode value without
> using SetMode, that would not clear the screen) -> connect it as
> console spliter and add the device to the list(use SetMode to set
> mode to the user defined mode or the best mode the devices supported
> if the mode is invalid. *now the mode is already set, so it would
> not clear the screen*).
> 
> Also remove the section of SetMode for debug version.
> 
> Impact: as the text mode may not be an invalid value, the SetMode
> may have no chance to be called during reconnect the graphics device.
> That means the screen may not be cleaned after finishing reconnect
> operation. There is one common condition: shell command "recoonect -r".
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Turner <Michael.Turner@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
>  .../GraphicsConsoleDxe/GraphicsConsole.c      | 42 ++++++++++++++-----
>  .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf |  2 +
>  2 files changed, 34 insertions(+), 10 deletions(-)
> 
> diff --git
> a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole
> .c
> b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsol
> e.c
> index 26ea19f300..c042451a9b 100644
> ---
> a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole
> .c
> +++
> b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsol
> e.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This is the main routine for initializing the Graphics Console support routines.
> 
> -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -384,6 +384,12 @@ GraphicsConsoleControllerDriverStart (
>    EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE    *Mode;
>    UINTN                                SizeOfInfo;
>    EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;
> +  INT32                                PreferMode;
> +  INT32                                Index;
> +  UINTN                                Column;
> +  UINTN                                Row;
> +  UINTN                                DefaultColumn;
> +  UINTN                                DefaultRow;
> 
>    ModeNumber = 0;
> 
> @@ -567,16 +573,32 @@ GraphicsConsoleControllerDriverStart (
>    //
>    Private->SimpleTextOutputMode.MaxMode = (INT32) MaxMode;
> 
> -  DEBUG_CODE_BEGIN ();
> -    Status = GraphicsConsoleConOutSetMode (&Private->SimpleTextOutput,
> 0);
> -    if (EFI_ERROR (Status)) {
> -      goto Error;
> -    }
> -    Status = GraphicsConsoleConOutOutputString (&Private-
> >SimpleTextOutput, (CHAR16 *)L"Graphics Console Started\n\r");
> -    if (EFI_ERROR (Status)) {
> -      goto Error;
> +  //
> +  // Initialize the Mode of graphics console devices
> +  //
> +  PreferMode = -1;
> +  DefaultColumn = PcdGet32 (PcdConOutColumn);
> +  DefaultRow = PcdGet32 (PcdConOutRow);
> +  Column = 0;
> +  Row = 0;
> +  for (Index = 0; Index < (INT32)MaxMode; Index++) {
> +    if (DefaultColumn != 0 && DefaultRow != 0) {
> +      if ((Private->ModeData[Index].Columns == DefaultColumn) &&
> +          (Private->ModeData[Index].Rows == DefaultRow)) {
> +        PreferMode = Index;
> +        break;
> +      }
> +    } else {
> +      if ((Private->ModeData[Index].Columns > Column) &&
> +          (Private->ModeData[Index].Rows > Row)) {
> +        Column = Private->ModeData[Index].Columns;
> +        Row = Private->ModeData[Index].Rows;
> +        PreferMode = Index;
> +      }
>      }
> -  DEBUG_CODE_END ();
> +  }
> +  Private->SimpleTextOutput.Mode->Mode = (INT32)PreferMode;
> +  DEBUG ((DEBUG_INFO, "Graphics Console Started, Mode: %d\n",
> PreferMode));

The change looks good to me,
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu

> 
>    //
>    // Install protocol interfaces for the Graphics Console device.
> diff --git
> a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole
> Dxe.inf
> b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsol
> eDxe.inf
> index f7caa65aa9..bcfd306eee 100644
> ---
> a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole
> Dxe.inf
> +++
> b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsol
> eDxe.inf
> @@ -65,6 +65,8 @@
>  [Pcd]
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ##
> SOMETIMES_CONSUMES
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution   ##
> SOMETIMES_CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow                 ##
> SOMETIMES_CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn              ##
> SOMETIMES_CONSUMES
> 
>  [UserExtensions.TianoCore."ExtraFiles"]
>    GraphicsConsoleDxeExtra.uni
> --
> 2.21.0.windows.1

Re: [PATCH V4 0/2] MdeModulePkg: Make the screen seamless

[Wu, Hao A]

For my understanding, the series looks like a feature rather than bug to me.
I suggest to hold this one until the stable tag is created.

Best Regards,
Hao Wu


> -----Original Message-----
> From: Gao, Zhichao
> Sent: Friday, May 24, 2019 10:40 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star; Gao, Liming; Sean Brogan;
> Michael Turner; Bret Barkelew; Laszlo Ersek
> Subject: [PATCH V4 0/2] MdeModulePkg: Make the screen seamless
> 
> For now most platforms support display function at PEI phase.
> But the conspliter and graphics console driver would clear the
> screen at BDS connect console phase. Maybe some platforms would
> show logo in the next or maybe not. For consumers, it looks like
> the screen flashed.
> So change the behavior of graphics console devices while connect
> console devices to maintain seamless screen from PEI.
> 
> Test has done on MinPlatform Kabylake-RVP3 which support PEI
> display.
> 
> V2:
> Make the SetMode not clear the screen only at the first boot during
> the first conncettion of graphics device.
> 
> V3:
> Abandon V2. Directly set the output mode without clear the screen
> while initialize the graphics console device. Add clear screen operation
> in stop function of graphics console device.
> 
> V4:
> Fix incorrect mode check in V3.
> Initialize the mode to an invalid mode. If no perfer mode is found, it
> is better to initialize its text mode to an invalid one.
> Remove the ClearScreen fuction in the BindingStop function in V3.
> The graphics output driver may disconnect before graphics console, that
> may cause a system exception because of using released resource.
> Impact: the screen would not be cleared after reconnect the graphics device
> thru software, such as 'reconnect -r' in shell.
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Turner <Michael.Turner@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> 
> Aaron Antone (1):
>   MdeModulePkg/ConSplitterDxe: Optimize the
> ConSplitterTextOutSetMode
> 
> Zhichao Gao (1):
>   MdeModulePkg/GraphicsConsoleDxe: Initialize the output mode
> 
>  .../Console/ConSplitterDxe/ConSplitter.c      | 33 ++++++++++-----
>  .../Console/ConSplitterDxe/ConSplitter.h      |  4 +-
>  .../GraphicsConsoleDxe/GraphicsConsole.c      | 42 ++++++++++++++-----
>  .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf |  2 +
>  4 files changed, 59 insertions(+), 22 deletions(-)
> 
> --
> 2.21.0.windows.1

Re: [edk2-devel] [PATCH V4 0/2] MdeModulePkg: Make the screen seamless

[Wu, Hao A]

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Wu, Hao A
> Sent: Monday, May 27, 2019 10:15 AM
> To: Gao, Zhichao; devel@edk2.groups.io
> Cc: Wang, Jian J; Ni, Ray; Zeng, Star; Gao, Liming; Sean Brogan; Michael
> Turner; Bret Barkelew; Laszlo Ersek
> Subject: Re: [edk2-devel] [PATCH V4 0/2] MdeModulePkg: Make the screen
> seamless
> 
> For my understanding, the series looks like a feature rather than bug to me.
> I suggest to hold this one until the stable tag is created.


Pushed via commits e85cfa2fa4..0a35997643.

Best Regards,
Hao Wu


> 
> Best Regards,
> Hao Wu
> 
> 
> > -----Original Message-----
> > From: Gao, Zhichao
> > Sent: Friday, May 24, 2019 10:40 AM
> > To: devel@edk2.groups.io
> > Cc: Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star; Gao, Liming; Sean Brogan;
> > Michael Turner; Bret Barkelew; Laszlo Ersek
> > Subject: [PATCH V4 0/2] MdeModulePkg: Make the screen seamless
> >
> > For now most platforms support display function at PEI phase.
> > But the conspliter and graphics console driver would clear the
> > screen at BDS connect console phase. Maybe some platforms would
> > show logo in the next or maybe not. For consumers, it looks like
> > the screen flashed.
> > So change the behavior of graphics console devices while connect
> > console devices to maintain seamless screen from PEI.
> >
> > Test has done on MinPlatform Kabylake-RVP3 which support PEI
> > display.
> >
> > V2:
> > Make the SetMode not clear the screen only at the first boot during
> > the first conncettion of graphics device.
> >
> > V3:
> > Abandon V2. Directly set the output mode without clear the screen
> > while initialize the graphics console device. Add clear screen operation
> > in stop function of graphics console device.
> >
> > V4:
> > Fix incorrect mode check in V3.
> > Initialize the mode to an invalid mode. If no perfer mode is found, it
> > is better to initialize its text mode to an invalid one.
> > Remove the ClearScreen fuction in the BindingStop function in V3.
> > The graphics output driver may disconnect before graphics console, that
> > may cause a system exception because of using released resource.
> > Impact: the screen would not be cleared after reconnect the graphics
> device
> > thru software, such as 'reconnect -r' in shell.
> >
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Hao Wu <hao.a.wu@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Star Zeng <star.zeng@intel.com>
> > Cc: Liming Gao <liming.gao@intel.com>
> > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > Cc: Michael Turner <Michael.Turner@microsoft.com>
> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> > Cc: Laszlo Ersek <lersek@redhat.com>
> >
> > Aaron Antone (1):
> >   MdeModulePkg/ConSplitterDxe: Optimize the
> > ConSplitterTextOutSetMode
> >
> > Zhichao Gao (1):
> >   MdeModulePkg/GraphicsConsoleDxe: Initialize the output mode
> >
> >  .../Console/ConSplitterDxe/ConSplitter.c      | 33 ++++++++++-----
> >  .../Console/ConSplitterDxe/ConSplitter.h      |  4 +-
> >  .../GraphicsConsoleDxe/GraphicsConsole.c      | 42 ++++++++++++++-----
> >  .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf |  2 +
> >  4 files changed, 59 insertions(+), 22 deletions(-)
> >
> > --
> > 2.21.0.windows.1
> 
> 
> 

Re: [edk2-devel] [PATCH V4 0/2] MdeModulePkg: Make the screen seamless

[Laszlo Ersek]

On 06/13/19 08:58, Wu, Hao A wrote:
>> -----Original Message-----
>> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>> Wu, Hao A
>> Sent: Monday, May 27, 2019 10:15 AM
>> To: Gao, Zhichao; devel@edk2.groups.io
>> Cc: Wang, Jian J; Ni, Ray; Zeng, Star; Gao, Liming; Sean Brogan; Michael
>> Turner; Bret Barkelew; Laszlo Ersek
>> Subject: Re: [edk2-devel] [PATCH V4 0/2] MdeModulePkg: Make the screen
>> seamless
>>
>> For my understanding, the series looks like a feature rather than bug to me.
>> I suggest to hold this one until the stable tag is created.
> 
> 
> Pushed via commits e85cfa2fa4..0a35997643.

Thanks for handling this!
Laszlo

> 
> Best Regards,
> Hao Wu
> 
> 
>>
>> Best Regards,
>> Hao Wu
>>
>>
>>> -----Original Message-----
>>> From: Gao, Zhichao
>>> Sent: Friday, May 24, 2019 10:40 AM
>>> To: devel@edk2.groups.io
>>> Cc: Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star; Gao, Liming; Sean Brogan;
>>> Michael Turner; Bret Barkelew; Laszlo Ersek
>>> Subject: [PATCH V4 0/2] MdeModulePkg: Make the screen seamless
>>>
>>> For now most platforms support display function at PEI phase.
>>> But the conspliter and graphics console driver would clear the
>>> screen at BDS connect console phase. Maybe some platforms would
>>> show logo in the next or maybe not. For consumers, it looks like
>>> the screen flashed.
>>> So change the behavior of graphics console devices while connect
>>> console devices to maintain seamless screen from PEI.
>>>
>>> Test has done on MinPlatform Kabylake-RVP3 which support PEI
>>> display.
>>>
>>> V2:
>>> Make the SetMode not clear the screen only at the first boot during
>>> the first conncettion of graphics device.
>>>
>>> V3:
>>> Abandon V2. Directly set the output mode without clear the screen
>>> while initialize the graphics console device. Add clear screen operation
>>> in stop function of graphics console device.
>>>
>>> V4:
>>> Fix incorrect mode check in V3.
>>> Initialize the mode to an invalid mode. If no perfer mode is found, it
>>> is better to initialize its text mode to an invalid one.
>>> Remove the ClearScreen fuction in the BindingStop function in V3.
>>> The graphics output driver may disconnect before graphics console, that
>>> may cause a system exception because of using released resource.
>>> Impact: the screen would not be cleared after reconnect the graphics
>> device
>>> thru software, such as 'reconnect -r' in shell.
>>>
>>> Cc: Jian J Wang <jian.j.wang@intel.com>
>>> Cc: Hao Wu <hao.a.wu@intel.com>
>>> Cc: Ray Ni <ray.ni@intel.com>
>>> Cc: Star Zeng <star.zeng@intel.com>
>>> Cc: Liming Gao <liming.gao@intel.com>
>>> Cc: Sean Brogan <sean.brogan@microsoft.com>
>>> Cc: Michael Turner <Michael.Turner@microsoft.com>
>>> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
>>> Cc: Laszlo Ersek <lersek@redhat.com>
>>>
>>> Aaron Antone (1):
>>>   MdeModulePkg/ConSplitterDxe: Optimize the
>>> ConSplitterTextOutSetMode
>>>
>>> Zhichao Gao (1):
>>>   MdeModulePkg/GraphicsConsoleDxe: Initialize the output mode
>>>
>>>  .../Console/ConSplitterDxe/ConSplitter.c      | 33 ++++++++++-----
>>>  .../Console/ConSplitterDxe/ConSplitter.h      |  4 +-
>>>  .../GraphicsConsoleDxe/GraphicsConsole.c      | 42 ++++++++++++++-----
>>>  .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf |  2 +
>>>  4 files changed, 59 insertions(+), 22 deletions(-)
>>>
>>> --
>>> 2.21.0.windows.1
>>
>>
>> 
>