From nobody Sat Nov 2 12:20:54 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1491386300361908.5327634814082; Wed, 5 Apr 2017 02:58:20 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3EB3F20080913; Wed, 5 Apr 2017 02:58:19 -0700 (PDT) Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2300C20080908 for ; Wed, 5 Apr 2017 02:58:18 -0700 (PDT) Received: by mail-pf0-x242.google.com with SMTP id 197so1245330pfv.0 for ; Wed, 05 Apr 2017 02:58:18 -0700 (PDT) Received: from localhost.localdomain ([210.246.60.121]) by smtp.gmail.com with ESMTPSA id b128sm36594102pfg.54.2017.04.05.02.58.14 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Apr 2017 02:58:16 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philjordan-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EK7Vp4BZV3JlhDgOcfuTAu2VkNK/FCVYtiOmV925Ym8=; b=q9qFe9ZTY+yyG3n7bxEKzgXGo6CwB6FRhH7tke5N1BcuuEzjxeVvetVRncqdcaS5oo DFJRRIbg41wpQBkCNBRoxpNYYlj9BKfb6V6CtjLaHc+LD5jWMyYseRpf8bzKUszDp1Xf 89B5ha6agUkt2Yw6yz93oDbYKNKazWnZwsXfUp/HGp+CzdLfqMXslkNB1XXLLAMmIUHR c2RUi3jm5RHR87gvTYvvYSrOL1b9Ta278WLoIdcqMEgEydNTaYcm27AdMGRBb2sA3mCJ KBEux2gPMLl/e6feCgXWV8wk5a1hppPOUdaz4AWKC7GLC1hSIFPmAwhFzDDy/AUw5sJW LQSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EK7Vp4BZV3JlhDgOcfuTAu2VkNK/FCVYtiOmV925Ym8=; b=jV1zB95YGBnlXABqEt0BQdHGmxChiXP2clU453FC70V/aEYBteMpSieMr2ru/HI9Th MQEzu8qt9JDp9mFFjVxDg03SYp93Kvhmf8a3sFg4mSw679QQESWJHzy9BiuV+Iy9Tu3f VUZhlmbuL9GJdpnmI1wl3PfyfLz+vDeS+8LRa+Jdgxzd8EP5hSo2/1dTJmCd7zTg/DxO 2ZWrM/advKrzi2Yfl6HOSkfclwW4RWTbolMXfEn5z3CgJdNnoj9jyQ6bwytNOWX/2x7R 8JZgaLSh88FekVEOq5QrvJeVYE6SG7vDbtDcAf+Gjzm6L4+zIymC820BSZQvQGaKm6xA AFSA== X-Gm-Message-State: AFeK/H11GZbz++DAc+CKQZUofnHw98bnRHnZKtSO5omnsgTtxQm93l6/O6/T71/n7agGuA== X-Received: by 10.98.59.139 with SMTP id w11mr8230726pfj.230.1491386297421; Wed, 05 Apr 2017 02:58:17 -0700 (PDT) From: Phil Dennis-Jordan To: edk2-devel@lists.01.org Date: Wed, 5 Apr 2017 21:58:00 +1200 Message-Id: <1491386280-50077-4-git-send-email-lists@philjordan.eu> X-Mailer: git-send-email 2.3.2 (Apple Git-55) In-Reply-To: <1491386280-50077-1-git-send-email-lists@philjordan.eu> References: <1491386280-50077-1-git-send-email-lists@philjordan.eu> Subject: [edk2] [PATCH v3 3/3] OvmfPkg/QemuVideoDxe: VMWare SVGA device support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Justen , Phil Dennis-Jordan , Laszlo Ersek MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Phil Dennis-Jordan In addition to the QXL, Cirrus, etc. VGA adapters, Qemu also implements a basic version of VMWare's SVGA display device. Drivers for this device exist for some guest OSes which do not support Qemu's other display adapters, so supporting it in OVMF is useful in conjunction with those OSes. This change adds support for the SVGA device's framebuffer to QemuVideoDxe's graphics output protocol implementation, based on VMWare's documentation. The most basic initialisation, framebuffer layout query, and mode setting operations are implemented. The device relies on port-based 32-bit I/O, unfortunately on misaligned addresses. This limits the driver's support to the x86 family of platforms. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Phil Dennis-Jordan --- Notes: v2: - Unaligned I/O helper functions moved to separate commit [Laszlo] - Multi-line function call whitespace fixes. =20 v3: - Dropped the "2" from "SVGA2" where appropriate. [Jordan, Laszlo] - Renamed various struct fields and functions with consistent prefixes = [Laszlo] - #include orders fixed [Laszlo] - Renamedi/moved lots of local variables to comply with convention. [La= szlo] - Added error checking to PCI BAR queries. [Laszlo] - Moved some function definitions around for better grouping. [Laszlo] - Fixed ClearScreen() to use the correct VRAM BAR. [Laszlo] - Changed modelist initialisation to fetch all mode data on startup, so= mode queries can return everything including channel masks without hitting= the device. Mask calculations hopefully make more sense now. [Laszlo] - Whitespace fixes. [Laszlo] - Fixed a memory leak in BAR query. OvmfPkg/QemuVideoDxe/Qemu.h | 29 ++++ OvmfPkg/QemuVideoDxe/Driver.c | 127 ++++++++++++++- OvmfPkg/QemuVideoDxe/Gop.c | 61 +++++++- OvmfPkg/QemuVideoDxe/Initialize.c | 161 ++++++++++++++++++++ 4 files changed, 371 insertions(+), 7 deletions(-) diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h index 2ce37defc5b8..7fbb25b3efd3 100644 --- a/OvmfPkg/QemuVideoDxe/Qemu.h +++ b/OvmfPkg/QemuVideoDxe/Qemu.h @@ -92,6 +92,7 @@ typedef enum { QEMU_VIDEO_CIRRUS_5446, QEMU_VIDEO_BOCHS, QEMU_VIDEO_BOCHS_MMIO, + QEMU_VIDEO_VMWARE_SVGA, } QEMU_VIDEO_VARIANT; =20 typedef struct { @@ -115,10 +116,13 @@ typedef struct { // UINTN MaxMode; QEMU_VIDEO_MODE_DATA *ModeData; + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *VmwareSvgaModeInfo; =20 QEMU_VIDEO_VARIANT Variant; FRAME_BUFFER_CONFIGURE *FrameBufferBltConfigure; UINTN FrameBufferBltConfigureSize; + UINT8 FrameBufferVramBarIndex; + UINT16 VmwareSvgaBasePort; } QEMU_VIDEO_PRIVATE_DATA; =20 /// @@ -502,9 +506,34 @@ QemuVideoBochsModeSetup ( BOOLEAN IsQxl ); =20 +EFI_STATUS +QemuVideoVmwareSvgaModeSetup ( + QEMU_VIDEO_PRIVATE_DATA *Private + ); + VOID InstallVbeShim ( IN CONST CHAR16 *CardName, IN EFI_PHYSICAL_ADDRESS FrameBufferBase ); + +VOID +VmwareSvgaWrite ( + QEMU_VIDEO_PRIVATE_DATA *Private, + UINT16 Register, + UINT32 Value + ); + +UINT32 +VmwareSvgaRead ( + QEMU_VIDEO_PRIVATE_DATA *Private, + UINT16 Register + ); + +VOID +InitializeVmwareSvgaGraphicsMode ( + QEMU_VIDEO_PRIVATE_DATA *Private, + QEMU_VIDEO_BOCHS_MODES *ModeData + ); + #endif diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c index fc8025ec46de..79c430e920d7 100644 --- a/OvmfPkg/QemuVideoDxe/Driver.c +++ b/OvmfPkg/QemuVideoDxe/Driver.c @@ -14,8 +14,10 @@ =20 **/ =20 -#include "Qemu.h" +#include #include +#include "Qemu.h" +#include "UnalignedIoInternal.h" =20 EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding =3D { QemuVideoControllerDriverSupported, @@ -58,6 +60,11 @@ QEMU_VIDEO_CARD gQemuVideoCardList[] =3D { QEMU_VIDEO_BOCHS_MMIO, L"QEMU VirtIO VGA" },{ + VMWARE_PCI_VENDOR_ID_VMWARE, + VMWARE_PCI_DEVICE_ID_VMWARE_SVGA2, + QEMU_VIDEO_VMWARE_SVGA, + L"QEMU VMWare SVGA" + },{ 0 /* end of list */ } }; @@ -242,6 +249,7 @@ QemuVideoControllerDriverStart ( goto ClosePciIo; } Private->Variant =3D Card->Variant; + Private->FrameBufferVramBarIndex =3D PCI_BAR_IDX0; =20 // // IsQxl is based on the detected Card->Variant, which at a later point = might @@ -317,6 +325,59 @@ QemuVideoControllerDriverStart ( } =20 // + // Check if accessing Vmware SVGA interface works + // + if (Private->Variant =3D=3D QEMU_VIDEO_VMWARE_SVGA) { + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *IoDesc; + UINT32 TargetId; + UINT32 SvgaIdRead; + + IoDesc =3D NULL; + Status =3D Private->PciIo->GetBarAttributes ( + Private->PciIo, + PCI_BAR_IDX0, + NULL, + (VOID**) &IoDesc + ); + if (EFI_ERROR(Status) || + IoDesc->ResType !=3D ACPI_ADDRESS_SPACE_TYPE_IO || + IoDesc->AddrRangeMin >=3D MAX_UINT16 || + IoDesc->AddrRangeMin + VMWARE_SVGA_VALUE_PORT >=3D MAX_UINT16) { + if (IoDesc !=3D NULL) { + FreePool (IoDesc); + } + Status =3D EFI_DEVICE_ERROR; + goto RestoreAttributes; + } + Private->VmwareSvgaBasePort =3D (UINT16) IoDesc->AddrRangeMin; + FreePool (IoDesc); + + TargetId =3D VMWARE_SVGA_ID_2; + while (TRUE) { + VmwareSvgaWrite (Private, VmwareSvgaRegId, TargetId); + SvgaIdRead =3D VmwareSvgaRead (Private, VmwareSvgaRegId); + if ((SvgaIdRead =3D=3D TargetId) || (TargetId <=3D VMWARE_SVGA_ID_0)= ) { + break; + } + TargetId --; + } + + if (SvgaIdRead !=3D TargetId) { + DEBUG (( + DEBUG_ERROR, + "QemuVideo: QEMU_VIDEO_VMWARE_SVGA ID mismatch " + "(got 0x%x, base address 0x%x)\n", + SvgaIdRead, + Private->VmwareSvgaBasePort + )); + Status =3D EFI_DEVICE_ERROR; + goto RestoreAttributes; + } + + Private->FrameBufferVramBarIndex =3D PCI_BAR_IDX1; + } + + // // Get ParentDevicePath // Status =3D gBS->HandleProtocol ( @@ -371,6 +432,9 @@ QemuVideoControllerDriverStart ( case QEMU_VIDEO_BOCHS: Status =3D QemuVideoBochsModeSetup (Private, IsQxl); break; + case QEMU_VIDEO_VMWARE_SVGA: + Status =3D QemuVideoVmwareSvgaModeSetup (Private); + break; default: ASSERT (FALSE); Status =3D EFI_DEVICE_ERROR; @@ -750,7 +814,7 @@ ClearScreen ( Private->PciIo->Mem.Write ( Private->PciIo, EfiPciIoWidthFillUint32, - 0, + Private->FrameBufferVramBarIndex, 0, 0x400000 >> 2, &Color @@ -888,6 +952,35 @@ BochsRead ( } =20 VOID +VmwareSvgaWrite ( + QEMU_VIDEO_PRIVATE_DATA *Private, + UINT16 Register, + UINT32 Value + ) +{ + UnalignedIoWrite32 ( + Private->VmwareSvgaBasePort + VMWARE_SVGA_INDEX_PORT, + Register + ); + UnalignedIoWrite32 ( + Private->VmwareSvgaBasePort + VMWARE_SVGA_VALUE_PORT, + Value); +} + +UINT32 +VmwareSvgaRead ( + QEMU_VIDEO_PRIVATE_DATA *Private, + UINT16 Register + ) +{ + UnalignedIoWrite32 ( + Private->VmwareSvgaBasePort + VMWARE_SVGA_INDEX_PORT, + Register); + return UnalignedIoRead32 ( + Private->VmwareSvgaBasePort + VMWARE_SVGA_VALUE_PORT); +} + +VOID VgaOutb ( QEMU_VIDEO_PRIVATE_DATA *Private, UINTN Reg, @@ -941,6 +1034,35 @@ InitializeBochsGraphicsMode ( ClearScreen (Private); } =20 +VOID +InitializeVmwareSvgaGraphicsMode ( + QEMU_VIDEO_PRIVATE_DATA *Private, + QEMU_VIDEO_BOCHS_MODES *ModeData + ) +{ + UINT32 Capabilities; + + VmwareSvgaWrite (Private, VmwareSvgaRegWidth, ModeData->Width); + VmwareSvgaWrite (Private, VmwareSvgaRegHeight, ModeData->Height); + + Capabilities =3D VmwareSvgaRead ( + Private, + VmwareSvgaRegCapabilities + ); + if ((Capabilities & VMWARE_SVGA_CAP_8BIT_EMULATION) !=3D 0) { + VmwareSvgaWrite ( + Private, + VmwareSvgaRegBitsPerPixel, + ModeData->ColorDepth + ); + } + + VmwareSvgaWrite (Private, VmwareSvgaRegEnable, 1); + + SetDefaultPalette (Private); + ClearScreen (Private); +} + EFI_STATUS EFIAPI InitializeQemuVideo ( @@ -975,3 +1097,4 @@ InitializeQemuVideo ( =20 return Status; } + diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c index 359e9217d3d1..934c9f39b459 100644 --- a/OvmfPkg/QemuVideoDxe/Gop.c +++ b/OvmfPkg/QemuVideoDxe/Gop.c @@ -13,6 +13,7 @@ =20 **/ =20 +#include #include "Qemu.h" =20 STATIC @@ -75,6 +76,42 @@ QemuVideoCompleteModeData ( return EFI_SUCCESS; } =20 +STATIC +EFI_STATUS +QemuVideoVmwareSvgaCompleteModeData ( + IN QEMU_VIDEO_PRIVATE_DATA *Private, + OUT EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode + ) +{ + EFI_STATUS Status; + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *FrameBufDesc; + UINT32 BytesPerLine, FbOffset, BytesPerPi= xel; + + Info =3D Mode->Info; + CopyMem (Info, &Private->VmwareSvgaModeInfo[Mode->Mode], sizeof(*Info)); + BytesPerPixel =3D Private->ModeData[Mode->Mode].ColorDepth / 8; + BytesPerLine =3D Info->PixelsPerScanLine * BytesPerPixel; + + FbOffset =3D VmwareSvgaRead (Private, VmwareSvgaRegFbOffset); + + Status =3D Private->PciIo->GetBarAttributes ( + Private->PciIo, + PCI_BAR_IDX1, + NULL, + (VOID**) &FrameBufDesc + ); + if (EFI_ERROR(Status)) { + return EFI_DEVICE_ERROR; + } + + Mode->FrameBufferBase =3D FrameBufDesc->AddrRangeMin + FbOffset; + Mode->FrameBufferSize =3D BytesPerLine * Info->VerticalResolution; + + FreePool (FrameBufDesc); + return Status; +} + =20 // // Graphics Output Protocol Member Functions @@ -124,10 +161,14 @@ Routine Description: =20 *SizeOfInfo =3D sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION); =20 - ModeData =3D &Private->ModeData[ModeNumber]; - (*Info)->HorizontalResolution =3D ModeData->HorizontalResolution; - (*Info)->VerticalResolution =3D ModeData->VerticalResolution; - QemuVideoCompleteModeInfo (ModeData, *Info); + if (Private->Variant =3D=3D QEMU_VIDEO_VMWARE_SVGA) { + **Info =3D Private->VmwareSvgaModeInfo[ModeNumber]; + } else { + ModeData =3D &Private->ModeData[ModeNumber]; + (*Info)->HorizontalResolution =3D ModeData->HorizontalResolution; + (*Info)->VerticalResolution =3D ModeData->VerticalResolution; + QemuVideoCompleteModeInfo (ModeData, *Info); + } =20 return EFI_SUCCESS; } @@ -176,6 +217,12 @@ Routine Description: case QEMU_VIDEO_BOCHS: InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->I= nternalModeIndex]); break; + case QEMU_VIDEO_VMWARE_SVGA: + InitializeVmwareSvgaGraphicsMode ( + Private, + &QemuVideoBochsModes[ModeData->InternalModeIndex] + ); + break; default: ASSERT (FALSE); return EFI_DEVICE_ERROR; @@ -186,7 +233,11 @@ Routine Description: This->Mode->Info->VerticalResolution =3D ModeData->VerticalResolution; This->Mode->SizeOfInfo =3D sizeof(EFI_GRAPHICS_OUTPUT_MODE_INFORMATION); =20 - QemuVideoCompleteModeData (Private, This->Mode); + if (Private->Variant =3D=3D QEMU_VIDEO_VMWARE_SVGA) { + QemuVideoVmwareSvgaCompleteModeData (Private, This->Mode); + } else { + QemuVideoCompleteModeData (Private, This->Mode); + } =20 // // Re-initialize the frame buffer configure when mode changes. diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initi= alize.c index d5d8cfef9661..8c5c993c7d0e 100644 --- a/OvmfPkg/QemuVideoDxe/Initialize.c +++ b/OvmfPkg/QemuVideoDxe/Initialize.c @@ -13,6 +13,7 @@ =20 **/ =20 +#include #include "Qemu.h" =20 =20 @@ -346,3 +347,163 @@ QemuVideoBochsModeSetup ( return EFI_SUCCESS; } =20 +EFI_STATUS +QemuVideoVmwareSvgaModeSetup ( + QEMU_VIDEO_PRIVATE_DATA *Private + ) +{ + EFI_STATUS Status; + UINT32 FbSize; + UINT32 MaxWidth, MaxHeight; + UINT32 Capabilities; + UINT32 BitsPerPixel; + UINT32 Index; + QEMU_VIDEO_MODE_DATA *ModeData; + QEMU_VIDEO_BOCHS_MODES *VideoMode; + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *ModeInfo; + + VmwareSvgaWrite (Private, VmwareSvgaRegEnable, 0); + + Private->ModeData =3D + AllocatePool (sizeof (Private->ModeData[0]) * QEMU_VIDEO_BOCHS_MODE_CO= UNT); + if (Private->ModeData =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto ModeDataAllocError; + } + + Private->VmwareSvgaModeInfo =3D + AllocatePool ( + sizeof (Private->VmwareSvgaModeInfo[0]) * QEMU_VIDEO_BOCHS_MODE_COUNT + ); + if (Private->VmwareSvgaModeInfo =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto ModeInfoAllocError; + } + + FbSize =3D VmwareSvgaRead (Private, VmwareSvgaRegFbSize); + MaxWidth =3D VmwareSvgaRead (Private, VmwareSvgaRegMaxWidth); + MaxHeight =3D VmwareSvgaRead (Private, VmwareSvgaRegMaxHeight); + Capabilities =3D VmwareSvgaRead (Private, VmwareSvgaRegCapabilities); + if ((Capabilities & VMWARE_SVGA_CAP_8BIT_EMULATION) !=3D 0) { + BitsPerPixel =3D VmwareSvgaRead ( + Private, + VmwareSvgaRegHostBitsPerPixel + ); + VmwareSvgaWrite ( + Private, + VmwareSvgaRegBitsPerPixel, + BitsPerPixel + ); + } else { + BitsPerPixel =3D VmwareSvgaRead ( + Private, + VmwareSvgaRegBitsPerPixel + ); + } + + if (FbSize =3D=3D 0 || + MaxWidth =3D=3D 0 || + MaxHeight =3D=3D 0 || + BitsPerPixel =3D=3D 0 || + BitsPerPixel % 8 !=3D 0) { + Status =3D EFI_DEVICE_ERROR; + goto Rollback; + } + + ModeData =3D Private->ModeData; + ModeInfo =3D Private->VmwareSvgaModeInfo; + VideoMode =3D &QemuVideoBochsModes[0]; + for (Index =3D 0; Index < QEMU_VIDEO_BOCHS_MODE_COUNT; Index ++) { + UINTN RequiredFbSize; + + RequiredFbSize =3D (UINTN) VideoMode->Width * VideoMode->Height * + (BitsPerPixel / 8); + if (RequiredFbSize <=3D FbSize && + VideoMode->Width <=3D MaxWidth && + VideoMode->Height <=3D MaxHeight) { + UINT32 BytesPerLine; + UINT32 RedMask, GreenMask, BlueMask, PixelMask; + + VmwareSvgaWrite ( + Private, + VmwareSvgaRegWidth, + VideoMode->Width + ); + VmwareSvgaWrite ( + Private, + VmwareSvgaRegHeight, + VideoMode->Height + ); + BytesPerLine =3D VmwareSvgaRead ( + Private, + VmwareSvgaRegBytesPerLine + ); + + ModeData->InternalModeIndex =3D Index; + ModeData->HorizontalResolution =3D VideoMode->Width; + ModeData->VerticalResolution =3D VideoMode->Height; + ModeData->ColorDepth =3D BitsPerPixel; + + // + // Setting VmwareSvgaRegWidth/VmwareSvgaRegHeight actually changes + // the device's display mode, so we all properties of each mode up f= ront + // to avoid inadvertent mode changes later. + // + ModeInfo->Version =3D 0; + ModeInfo->HorizontalResolution =3D ModeData->HorizontalResolution; + ModeInfo->VerticalResolution =3D ModeData->VerticalResolution; + + ModeInfo->PixelFormat =3D PixelBitMask; + + RedMask =3D VmwareSvgaRead (Private, VmwareSvgaRegRedMask); + ModeInfo->PixelInformation.RedMask =3D RedMask; + + GreenMask =3D VmwareSvgaRead (Private, VmwareSvgaRegGreenMask); + ModeInfo->PixelInformation.GreenMask =3D GreenMask; + + BlueMask =3D VmwareSvgaRead (Private, VmwareSvgaRegBlueMask); + ModeInfo->PixelInformation.BlueMask =3D BlueMask; + + BytesPerLine =3D VmwareSvgaRead (Private, VmwareSvgaRegBytesPerLine); + + if (BitsPerPixel =3D=3D 32) { + if (BlueMask =3D=3D 0xff && GreenMask =3D=3D 0xff00 && RedMask =3D= =3D 0xff0000) { + ModeInfo->PixelFormat =3D PixelBlueGreenRedReserved8BitPerColor; + } else if (BlueMask =3D=3D 0xff0000 && + GreenMask =3D=3D 0xff00 && + RedMask =3D=3D 0xff) { + ModeInfo->PixelFormat =3D PixelRedGreenBlueReserved8BitPerColor; + } + } + + // + // Reserved mask is whatever bits in the pixel are not used for RGB. + // PixelMask is as many binary 1s as BitsPerPixel, but shifting UINT= 32 by + // 32 is undefined, so work around that. BitsPerPixel isn't 0 so + // (BitsPerPixel - 1u) is ok. + // + PixelMask =3D ((0x1u << 1u) << (BitsPerPixel - 1u)) - 1u; + ModeInfo->PixelInformation.ReservedMask =3D + PixelMask & ~(RedMask | GreenMask | BlueMask); + + ModeInfo->PixelsPerScanLine =3D BytesPerLine / (BitsPerPixel / 8); + + ModeData ++; + ModeInfo ++; + } + VideoMode ++; + } + Private->MaxMode =3D ModeData - Private->ModeData; + return EFI_SUCCESS; + +Rollback: + FreePool(Private->VmwareSvgaModeInfo); + Private->VmwareSvgaModeInfo =3D NULL; + +ModeInfoAllocError: + FreePool(Private->ModeData); + Private->ModeData =3D NULL; + +ModeDataAllocError: + return Status; +} --=20 2.3.2 (Apple Git-55) _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel