From nobody Mon Feb 9 14:14:22 2026 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+85731+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+85731+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1642413538; cv=none; d=zohomail.com; s=zohoarc; b=EBQuWeyy92jL6JDquahLNw/RJCPVgPt+K49lgJLhog77e0/712cHsCWs2gJMYMhBwPZgSTeEAPgIaonBThGNInFCSaiQzoNeNfiK+wVeA31g4JOMN/rh50vJdaql9wE813ex6zFp2QeLgDgTiBdzRGstVREItHqco/+3P99+8E0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642413538; h=Content-Type: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=RSWZLfpH0dbg8+E1tb+bhLm8FWS4QlO3N1+MJKt5hoU=; b=kCcYlNgmlBwy1HmFUX24hRSd9j4eGi51dSnckJNj3ruSGAwjBGbn4hDfwZEg15TMs+g8fm5Wl2CzS2UOocKLlHbSYDD8xXS/69c5+G37TTXcXjQ6i2RficTWmOqdnkTZeZbwL6TmHZ1Ij51Zax6B7dMqEnZDyVTAeMoUNYH2NoI= 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+85731+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 1642413538976951.2311599670359; Mon, 17 Jan 2022 01:58:58 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2HZQYY1788612xBqq2Q1IIAs; Mon, 17 Jan 2022 01:58:58 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.9410.1642413537772396482 for ; Mon, 17 Jan 2022 01:58:58 -0800 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-81-Q7KwJLpNOQaDjPx0qMX8aQ-1; Mon, 17 Jan 2022 04:58:54 -0500 X-MC-Unique: Q7KwJLpNOQaDjPx0qMX8aQ-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CB3A64092; Mon, 17 Jan 2022 09:58:52 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE7F260C42; Mon, 17 Jan 2022 09:58:39 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2AEF11800614; Mon, 17 Jan 2022 10:58:17 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Jordan Justen , Min Xu , Jiewen Yao , Julien Grall , Tom Lendacky , Brijesh Singh , James Bottomley , Erdem Aktas , Pawel Polawski , Anthony Perard , Ard Biesheuvel Subject: [edk2-devel] [PATCH v2 2/5] OvmfPkg/QemuVideoDxe: simplify InitializeBochsGraphicsMode Date: Mon, 17 Jan 2022 10:58:14 +0100 Message-Id: <20220117095817.1964424-3-kraxel@redhat.com> In-Reply-To: <20220117095817.1964424-1-kraxel@redhat.com> References: <20220117095817.1964424-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: ylTb4iu4zAJMkEH93CpsZIIJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642413538; bh=Mh2UtkcN8xFTRAGizNaP+Yh+6Dc0InwWyXjMtl3+LDU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=UJqQEgH1B3MggincjS2PhFMsRWJwTazhVTd3gU3p1PzudPHSeaSeZJYFeNEYQ6O5Acp JWYJEbNrFgyhu3GfGb0oDfxFaZYMEZqwXm8VajGRVJlt0cuVZwH0AvMMBEreo7q3IHFRJ BSd9EdH0MaVDBsXyFmt12plA/oXLUexJHn4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642413540865100002 Content-Type: text/plain; charset="utf-8" struct QEMU_VIDEO_MODE_DATA has all the data needed to set the video mode, there is no need to take the extra indirection and use struct QEMU_VIDEO_BOCHS_MODES. Signed-off-by: Gerd Hoffmann --- OvmfPkg/QemuVideoDxe/Qemu.h | 3 +-- OvmfPkg/QemuVideoDxe/Driver.c | 14 +++++++------- OvmfPkg/QemuVideoDxe/Gop.c | 2 +- OvmfPkg/QemuVideoDxe/Initialize.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h index 8f05898f862c..fef648c967b2 100644 --- a/OvmfPkg/QemuVideoDxe/Qemu.h +++ b/OvmfPkg/QemuVideoDxe/Qemu.h @@ -150,7 +150,6 @@ extern UINT16 Seq_800_600_256_60= []; extern UINT8 Crtc_1024_768_256_60[]; extern UINT16 Seq_1024_768_256_60[]; extern QEMU_VIDEO_CIRRUS_MODES QemuVideoCirrusModes[]; -extern QEMU_VIDEO_BOCHS_MODES QemuVideoBochsModes[]; extern EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding; extern EFI_COMPONENT_NAME_PROTOCOL gQemuVideoComponentName; extern EFI_COMPONENT_NAME2_PROTOCOL gQemuVideoComponentName2; @@ -414,7 +413,7 @@ InitializeCirrusGraphicsMode ( VOID InitializeBochsGraphicsMode ( QEMU_VIDEO_PRIVATE_DATA *Private, - QEMU_VIDEO_BOCHS_MODES *ModeData + QEMU_VIDEO_MODE_DATA *ModeData ); =20 VOID diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c index d9f0a2464aa3..b91909a14e59 100644 --- a/OvmfPkg/QemuVideoDxe/Driver.c +++ b/OvmfPkg/QemuVideoDxe/Driver.c @@ -987,14 +987,14 @@ VgaOutb ( VOID InitializeBochsGraphicsMode ( QEMU_VIDEO_PRIVATE_DATA *Private, - QEMU_VIDEO_BOCHS_MODES *ModeData + QEMU_VIDEO_MODE_DATA *ModeData ) { DEBUG (( DEBUG_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n", - ModeData->Width, - ModeData->Height, + ModeData->HorizontalResolution, + ModeData->VerticalResolution, ModeData->ColorDepth )); =20 @@ -1007,10 +1007,10 @@ InitializeBochsGraphicsMode ( BochsWrite (Private, VBE_DISPI_INDEX_Y_OFFSET, 0); =20 BochsWrite (Private, VBE_DISPI_INDEX_BPP, (UINT16)ModeData->ColorDepth); - BochsWrite (Private, VBE_DISPI_INDEX_XRES, (UINT16)ModeData->Width); - BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH, (UINT16)ModeData->Width= ); - BochsWrite (Private, VBE_DISPI_INDEX_YRES, (UINT16)ModeData->Height); - BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16)ModeData->Heig= ht); + BochsWrite (Private, VBE_DISPI_INDEX_XRES, (UINT16)ModeData->HorizontalR= esolution); + BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH, (UINT16)ModeData->Horiz= ontalResolution); + BochsWrite (Private, VBE_DISPI_INDEX_YRES, (UINT16)ModeData->VerticalRes= olution); + BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16)ModeData->Vert= icalResolution); =20 BochsWrite ( Private, diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c index 5ad0afe88378..0c4dea7fb6f2 100644 --- a/OvmfPkg/QemuVideoDxe/Gop.c +++ b/OvmfPkg/QemuVideoDxe/Gop.c @@ -177,7 +177,7 @@ Routine Description: break; case QEMU_VIDEO_BOCHS_MMIO: case QEMU_VIDEO_BOCHS: - InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData-= >InternalModeIndex]); + InitializeBochsGraphicsMode (Private, ModeData); break; default: ASSERT (FALSE); diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initi= alize.c index 533ec661d64f..8a70cf848483 100644 --- a/OvmfPkg/QemuVideoDxe/Initialize.c +++ b/OvmfPkg/QemuVideoDxe/Initialize.c @@ -202,7 +202,7 @@ QemuVideoCirrusModeSetup ( /// /// Table of supported video modes /// -QEMU_VIDEO_BOCHS_MODES QemuVideoBochsModes[] =3D { +STATIC QEMU_VIDEO_BOCHS_MODES QemuVideoBochsModes[] =3D { { 640, 480, 32 }, { 800, 480, 32 }, { 800, 600, 32 }, --=20 2.34.1 -=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 (#85731): https://edk2.groups.io/g/devel/message/85731 Mute This Topic: https://groups.io/mt/88481081/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-