From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6879.1588927128006250571 for ; Fri, 08 May 2020 01:38:49 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: guomin.jiang@intel.com) IronPort-SDR: 9ZCXpoQ+fmo4f6gKjpyEpVK1q8xRupKB76esSyYNeLpS4ayqSJSlqlK5bxW3T9h4OBeb0JulWR 6j1myMXaKZ8A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 01:38:47 -0700 IronPort-SDR: LD/Cj6LZa/mpTMdNEnVdq89vvfOq3S+wtsGOwp+0igGscGtJ/pbQeSULXU2LqSFmoCO2TXBQBt wcNfixNSvcpw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366641" Received: from guominji-mobl.ccr.corp.intel.com ([10.238.4.95]) by FMSMGA003.fm.intel.com with ESMTP; 08 May 2020 01:38:46 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Zhichao Gao , Ray Ni Subject: [PATCH 13/18] MdeModulePkg/ConSplitterDxe: Remove All UGA Support Date: Fri, 8 May 2020 16:38:19 +0800 Message-Id: <20200508083824.1785-14-guomin.jiang@intel.com> X-Mailer: git-send-email 2.25.1.windows.1 In-Reply-To: <20200508083824.1785-1-guomin.jiang@intel.com> References: <20200508083824.1785-1-guomin.jiang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: GuoMinJ REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368 Avoid OVMF hang when remove UGA support. Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Guomin Jiang --- .../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