From nobody Mon Feb 9 11:29:35 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+85734+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+85734+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1642413558; cv=none; d=zohomail.com; s=zohoarc; b=ZMsDAgymC6GmbTbD3KS6B8YuS1LBTKIcsjdlfozXWm6+83g9P2gh5MfRej4odReuRqItLq0OpvmnYqBNUKAlmrxLiCGlUflNky+LVqAFvfi0WryAKo3NcdVPU56FRGwUaF8MNdWX5C0GhF6EKtJVA8UlT9nxwz0ChEDDnn8n1XA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642413558; 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=ez0XCGyJsQ2DaUJ1JpHC7jMv+qp03mq6JhHo9qsoHAs=; b=aw4bliUMmfGYDKA3GacE6xLGpyKSEg6WeduYBPB5Pn0otqLa8gMVXTuCm4H2qZzVhgY06izvz+aPd8IhW5RHv6LkUSdJH2r2RD2JSgt87PeQNPYu4N2rRxto3zU7i9T8iL+dHBvsMAwSRX3rJ0/UzMV7yjXto5X1c+oaN4NErQw= 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+85734+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 1642413558003190.45703377356028; Mon, 17 Jan 2022 01:59:18 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2qdpYY1788612xLCUEXTBiHL; Mon, 17 Jan 2022 01:59:17 -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.web12.9273.1642413556991670168 for ; Mon, 17 Jan 2022 01:59:17 -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-633-sr_lX7oIOgi9MX5RYtd-VA-1; Mon, 17 Jan 2022 04:59:11 -0500 X-MC-Unique: sr_lX7oIOgi9MX5RYtd-VA-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FBB218C8C01; Mon, 17 Jan 2022 09:59:06 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2A2870D26; Mon, 17 Jan 2022 09:58:53 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3C2FF1800620; 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 4/5] OvmfPkg/QemuVideoDxe: factor out QemuVideoBochsAddMode Date: Mon, 17 Jan 2022 10:58:16 +0100 Message-Id: <20220117095817.1964424-5-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.11 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: AsLGnPIyo5QQlKWbIxKiPpNAx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642413557; bh=Imz0cSst/4rV0TXnba+Ly4Nw0OzjNKSulcXnW5XvXNw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=EA2w0GErQBvW+v66DABkN2LhHLp5VXXhThXvr/8tYQA8k96ov1BywSv91RGN2avf+ea dPowc7CfVHSdJ67901B/V8aCzF7IabAThqsS9wy4ws2hx+WUAaHZDEAxatcFQjAWe0NqT QmobsoLsll7Nqbe7zs1js0JGGpns8LTIxss= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642413559063100001 Content-Type: text/plain; charset="utf-8" Add helper function to add a video mode to the list of modes. Move code. Minor debug logging tweaks, no other functional change. Signed-off-by: Gerd Hoffmann --- OvmfPkg/QemuVideoDxe/Initialize.c | 77 +++++++++++++++++++------------ 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initi= alize.c index 2b174d13faf2..8c5c9176ad21 100644 --- a/OvmfPkg/QemuVideoDxe/Initialize.c +++ b/OvmfPkg/QemuVideoDxe/Initialize.c @@ -245,16 +245,53 @@ STATIC QEMU_VIDEO_BOCHS_MODES QemuVideoBochsModes[] = =3D { #define QEMU_VIDEO_BOCHS_MODE_COUNT \ (ARRAY_SIZE (QemuVideoBochsModes)) =20 +STATIC +VOID +QemuVideoBochsAddMode ( + QEMU_VIDEO_PRIVATE_DATA *Private, + UINT32 AvailableFbSize, + UINT32 Width, + UINT32 Height + ) +{ + QEMU_VIDEO_MODE_DATA *ModeData =3D Private->ModeData + Private->MaxMode; + UINTN RequiredFbSize; + + RequiredFbSize =3D (UINTN)Width * Height * 4; + if (RequiredFbSize > AvailableFbSize) { + DEBUG (( + DEBUG_INFO, + "Skipping Bochs Mode %dx%d, 32-bit (not enough vram)\n", + Width, + Height + )); + return; + } + + ModeData->InternalModeIndex =3D (UINT32)Private->MaxMode; + ModeData->HorizontalResolution =3D Width; + ModeData->VerticalResolution =3D Height; + ModeData->ColorDepth =3D 32; + DEBUG (( + DEBUG_INFO, + "Adding Bochs Internal Mode %d: %dx%d, %d-bit\n", + ModeData->InternalModeIndex, + ModeData->HorizontalResolution, + ModeData->VerticalResolution, + ModeData->ColorDepth + )); + + Private->MaxMode++; +} + EFI_STATUS QemuVideoBochsModeSetup ( QEMU_VIDEO_PRIVATE_DATA *Private, BOOLEAN IsQxl ) { - UINT32 AvailableFbSize; - UINT32 Index; - QEMU_VIDEO_MODE_DATA *ModeData; - QEMU_VIDEO_BOCHS_MODES *VideoMode; + UINT32 AvailableFbSize; + UINT32 Index; =20 // // Fetch the available framebuffer size. @@ -343,34 +380,14 @@ QemuVideoBochsModeSetup ( return EFI_OUT_OF_RESOURCES; } =20 - ModeData =3D Private->ModeData; - VideoMode =3D &QemuVideoBochsModes[0]; for (Index =3D 0; Index < QEMU_VIDEO_BOCHS_MODE_COUNT; Index++) { - UINTN RequiredFbSize; - - RequiredFbSize =3D (UINTN)VideoMode->Width * VideoMode->Height * 4; - if (RequiredFbSize <=3D AvailableFbSize) { - ModeData->InternalModeIndex =3D Index; - ModeData->HorizontalResolution =3D VideoMode->Width; - ModeData->VerticalResolution =3D VideoMode->Height; - ModeData->ColorDepth =3D 32; - DEBUG (( - DEBUG_INFO, - "Adding Mode %d as Bochs Internal Mode %d: %dx%d, %d-bit\n", - (INT32)(ModeData - Private->ModeData), - ModeData->InternalModeIndex, - ModeData->HorizontalResolution, - ModeData->VerticalResolution, - ModeData->ColorDepth - )); - - ModeData++; - } - - VideoMode++; + QemuVideoBochsAddMode ( + Private, + AvailableFbSize, + QemuVideoBochsModes[Index].Width, + QemuVideoBochsModes[Index].Height + ); } =20 - Private->MaxMode =3D ModeData - Private->ModeData; - return EFI_SUCCESS; } --=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 (#85734): https://edk2.groups.io/g/devel/message/85734 Mute This Topic: https://groups.io/mt/88481085/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-