The information in commit message is not helpful for me
to understand why this change can avoid OVMF hang.

> -----Original Message-----
> From: Jiang, Guomin <guomin.ji...@intel.com>
> Sent: Friday, May 8, 2020 4:38 PM
> To: devel@edk2.groups.io
> Cc: GuoMinJ <newexplor...@gmail.com>; Gao, Zhichao <zhichao....@intel.com>; 
> Ni, Ray <ray...@intel.com>
> Subject: [PATCH 13/18] MdeModulePkg/ConSplitterDxe: Remove All UGA Support
> 
> From: GuoMinJ <newexplor...@gmail.com>
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368
> 
> Avoid OVMF hang when remove UGA support.
> 
> Cc: Zhichao Gao <zhichao....@intel.com>
> Cc: Ray Ni <ray...@intel.com>
> Signed-off-by: Guomin Jiang <guomin.ji...@intel.com>
> ---
>  .../Universal/Console/ConSplitterDxe/ConSplitter.c   | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
> b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
> index 3fdeee4b409b..18c25956d0d9 100644
> --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
> +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
> @@ -3060,12 +3060,14 @@ ConSplitterTextOutAddDevice (
>      DeviceStatus = ConSplitterAddGraphicsOutputMode (Private, 
> GraphicsOutput);
>    }
> 
> -  Status = GraphicsOutput->QueryMode (GraphicsOutput, 
> GraphicsOutput->Mode->Mode, &SizeOfInfo, &Info);
> -  if (EFI_ERROR (Status)) {
> -    return Status;
> +  if (GraphicsOutput != NULL) {
> +    Status = GraphicsOutput->QueryMode (GraphicsOutput, 
> GraphicsOutput->Mode->Mode, &SizeOfInfo, &Info);
> +    if (EFI_ERROR (Status)) {
> +      return Status;
> +    }
> +    ASSERT ( SizeOfInfo <= sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));
> +    FreePool (Info);
>    }
> -  ASSERT ( SizeOfInfo <= sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));
> -  FreePool (Info);
> 
>    if (((!EFI_ERROR (DeviceStatus)) || (!EFI_ERROR (Status))) &&
>        ((Private->CurrentNumberOfGraphicsOutput) == 1)) {
> --
> 2.25.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#58939): https://edk2.groups.io/g/devel/message/58939
Mute This Topic: https://groups.io/mt/74068792/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to