From nobody Fri May 17 07:07:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87191+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87191+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1646204361; cv=none; d=zohomail.com; s=zohoarc; b=OPSi5PsuHAs+IQ1pMjIucYGH2pAjhQlSx+UTjHPHKugf4aRLIWGjf87fFYcxaVjcy7mBwaY3QyRMR+i4zSPJ9TBeexFMbluOs50ABWxxPKUYFdcRVrWV8jVennSovRHiyqn5kbDfh1HXmf73sCIuKyrZR/lk2ArpmlhjthNO8nQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646204361; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=i+wJuWHjNXJT+xgZow4L52KbpoH2gpISQqh26qFjrBo=; b=RnVkIrB5T0WMoaYiYVAItSESSL+v5S7CXjVN54EtUzxGovJdL9q3t+So7pEEkQd7k+FrQ6rM4NNvsrumgpshXQT+1PR16Ceuv29dBwBX2JJbrMtNEByidXNgQxk51NXlCVWTUY5SNR/fAQK4CVUrSZi92PP0TpHORMF8wS0/Xcs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87191+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16462043617991021.1494148595139; Tue, 1 Mar 2022 22:59:21 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id QrpqYY1788612xSwOJt9b5QX; Tue, 01 Mar 2022 22:59:21 -0800 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web12.4990.1646204359724057108 for ; Tue, 01 Mar 2022 22:59:20 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10273"; a="253250014" X-IronPort-AV: E=Sophos;i="5.90,148,1643702400"; d="scan'208";a="253250014" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2022 22:59:20 -0800 X-IronPort-AV: E=Sophos;i="5.90,148,1643702400"; d="scan'208";a="510890881" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.15.53]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2022 22:59:18 -0800 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH v3 1/2] MdeModulePkg/GraphicsConsoleDxe: Check status to make sure no error Date: Wed, 2 Mar 2022 14:58:55 +0800 Message-Id: <20220302065856.727-2-guomin.jiang@intel.com> In-Reply-To: <20220302065856.727-1-guomin.jiang@intel.com> References: <20220302065856.727-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: dVOKByAogy90zc5VBfIwmAsDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1646204361; bh=EE7tAGksSDLDlWCeQlMGjAvcPLEGXp4PvaRNUxhKS1Y=; h=Cc:Date:From:Reply-To:Subject:To; b=ipIFW3RseiYu7DrcPitCCONhsWaQi0Fjf31oDqlHU0LB8uVZJb31fSes1aTiSkycMpz B1Dn77rMwfQpjuOEiqN5vVFJuIsQaK+Hl/R4T6a7CQ2t0NIF4KophWT4nIHnAZuVf8sqd pncBVvytBgnpCH4h2P46mToETcnmOZC2So8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1646204363395100001 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2668 SetMode will fail in some case. for example, without XServer. Should handle these case when SetMode fail. If we don't handle it, it will Segmentation fault. Cc: Jian J Wang Cc: Liming Gao Cc: Zhichao Gao Reviewed-by: Ray Ni Signed-off-by: Guomin Jiang --- .../Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= ole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c index 8f0cba9fcde9..07436cbd15bf 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 r= outines. =20 -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -518,7 +518,7 @@ GraphicsConsoleControllerDriverStart ( } } =20 - if (ModeNumber !=3D Private->GraphicsOutput->Mode->Mode) { + if (EFI_ERROR (Status) || (ModeNumber !=3D Private->GraphicsOutput->Mo= de->Mode)) { // // Current graphics mode is not set or is not set to the mode which = we have found, // set the new graphic mode. --=20 2.35.1.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87191): https://edk2.groups.io/g/devel/message/87191 Mute This Topic: https://groups.io/mt/89496385/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 07:07:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87192+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87192+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1646204362; cv=none; d=zohomail.com; s=zohoarc; b=kS2YwqFwEnK9eLypmlUsAYBhfJvoDI+wSxJHibSgn+Bt4Bie+J7PY6SEN9NhNwWIrN0QbSicavtmStvkZwBKwxdbODXGjEAD82Qe6nsYtvvVzydVmFmwYLidkQZuHr/Rm0IWr1yZtCbMJEE26eCLltzOg4Vh/D+ETKO9XV9QrA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646204362; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=YkUu+DCjh87S0C5wfbXNBqNicvfOiRnOtFBUhVvRhCI=; b=JsywvAjIE3nLWGY1wx89nJcZIaHbjTKrVdisP56j5zMUNCnwvBJ8ZXCqIxzhVMY8SymNXcya/KkttQf+rRNlCp8lpOie4YdZMhQMGZhBila5hvU491gWRF0ix/A9qxqtlAbFxL/rquMFiOQz29Su8O5glzF5f8ksIO94W4uSkCQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87192+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1646204362823834.6170660948986; Tue, 1 Mar 2022 22:59:22 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id rrbqYY1788612x8zRu1tpjoM; Tue, 01 Mar 2022 22:59:22 -0800 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web12.4990.1646204359724057108 for ; Tue, 01 Mar 2022 22:59:21 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10273"; a="253250021" X-IronPort-AV: E=Sophos;i="5.90,148,1643702400"; d="scan'208";a="253250021" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2022 22:59:21 -0800 X-IronPort-AV: E=Sophos;i="5.90,148,1643702400"; d="scan'208";a="510890885" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.15.53]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2022 22:59:20 -0800 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Andrew Fish , Ray Ni Subject: [edk2-devel] [PATCH v3 2/2] EmulatorPkg/EmuGopDxe: Set ModeInfo after Open successfully Date: Wed, 2 Mar 2022 14:58:56 +0800 Message-Id: <20220302065856.727-3-guomin.jiang@intel.com> In-Reply-To: <20220302065856.727-1-guomin.jiang@intel.com> References: <20220302065856.727-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: ILVrlWAQwFmB8xx36NrrZhapx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1646204362; bh=cA3qW9UI2YdrsmBHWkGmifZiyskKJrDlKV7iytR9k6M=; h=Cc:Date:From:Reply-To:Subject:To; b=bcAvjs/U9veV1ghOxsp77hdHv1zZsyHjMGQxPMc2Y+o9qNKd91wE/5X2zzsEYfmjA7z GcaOKOXc0Wt+jUM6r+8Va5vsX8ej3nTbZy36SN4jPUGfLqf4yfi7Uvj79rNbq/GsEzet2 2csYHsEZ9NHaK3Fq7GxovPRPMy4t/i8tqH0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1646204363406100004 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2668 WindowOpen will fail in some case. for example, without XServer. Shouldn't set ModeInfo in this case to avoid the caller use it incorrectly Cc: Andrew Fish Reviewed-by: Ray Ni Signed-off-by: Guomin Jiang --- EmulatorPkg/EmuGopDxe/GopScreen.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopS= creen.c index 41f748bc6402..88d95b88e162 100644 --- a/EmulatorPkg/EmuGopDxe/GopScreen.c +++ b/EmulatorPkg/EmuGopDxe/GopScreen.c @@ -1,6 +1,6 @@ /*++ @file =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -107,11 +107,7 @@ EmuGopSetMode ( return EFI_UNSUPPORTED; } =20 - ModeData =3D &Private->M= odeData[ModeNumber]; - This->Mode->Mode =3D ModeNumber; - Private->GraphicsOutput.Mode->Info->HorizontalResolution =3D ModeData->H= orizontalResolution; - Private->GraphicsOutput.Mode->Info->VerticalResolution =3D ModeData->V= erticalResolution; - Private->GraphicsOutput.Mode->Info->PixelsPerScanLine =3D ModeData->H= orizontalResolution; + ModeData =3D &Private->ModeData[ModeNumber]; =20 if (Private->HardwareNeedsStarting) { Status =3D EmuGopStartWindow ( @@ -128,6 +124,11 @@ EmuGopSetMode ( Private->HardwareNeedsStarting =3D FALSE; } =20 + This->Mode->Mode =3D ModeNumber; + Private->GraphicsOutput.Mode->Info->HorizontalResolution =3D ModeData->H= orizontalResolution; + Private->GraphicsOutput.Mode->Info->VerticalResolution =3D ModeData->V= erticalResolution; + Private->GraphicsOutput.Mode->Info->PixelsPerScanLine =3D ModeData->H= orizontalResolution; + Status =3D Private->EmuGraphicsWindow->Size ( Private->EmuGraphicsWindow, ModeData->HorizontalResolution, --=20 2.35.1.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87192): https://edk2.groups.io/g/devel/message/87192 Mute This Topic: https://groups.io/mt/89496386/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-