From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.85.128.66; helo=mail-wm1-f66.google.com; envelope-from=philmd@redhat.com; receiver=edk2-devel@lists.01.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) (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 9A77B21C8EFB5 for ; Thu, 1 Nov 2018 11:55:01 -0700 (PDT) Received: by mail-wm1-f66.google.com with SMTP id u13-v6so2164866wmc.4 for ; Thu, 01 Nov 2018 11:55:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=6EfrCajc5LyX0f1nrb+yPh6YD52LTD04DeTSdTqk8us=; b=MhRRysb0QATnsXoInswmUN5aTrEWJoP/pCCC/rCNxxwkee5zVwbkltk8f7d8ogdZn+ x72RPEjgY7NumaguFHCxlNOoONy731JJE1qA9Xm8TY+lDSny6uSvgWxmMchkuP31qPib HdOJCSa447lEC/oP00seezct/6u2M8IoTk1mQgOw2GsVMCAoM58T9+b55brUBIbPIzbU 5FXo/xa2AWxLnpGR72hI1RsnPQQUBjyWrjSMWygmg7pD2HZrEBdOutbGXk1ch9qB+CAS Z5qCYyxgF2h+SyPrrj8eO9exoSJkTvrOJ3Yo7g2vvMXqbAbK9gCjyEzZcG3qR3SxEIQF Wz3g== X-Gm-Message-State: AGRZ1gJybcU62qI0mViOaM7Ztz0ik7ca8cOojUlIHxZztU2BQs3EVmAh xD2hmFcK3I8nwE6bzi9sFO1Go5VYIU4= X-Google-Smtp-Source: AJdET5f9Tk1b6JM7ANzU5fHXCAoQdYabfJnepbOnNzy7zRy2AOloI9R5iUnpDs9wq9eLEsdn5OawcA== X-Received: by 2002:a1c:2b03:: with SMTP id r3-v6mr6720622wmr.131.1541098500174; Thu, 01 Nov 2018 11:55:00 -0700 (PDT) Received: from [192.168.1.130] ([139.47.31.199]) by smtp.gmail.com with ESMTPSA id n1-v6sm13819501wra.59.2018.11.01.11.54.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Nov 2018 11:54:59 -0700 (PDT) To: yuchenlin@synology.com, edk2-devel@lists.01.org Cc: phil@philjordan.eu, jordan.l.justen@intel.com, anthony.perard@citrix.com, lersek@redhat.com References: <20181024064008.26535-1-yuchenlin@synology.com> <20181024064008.26535-5-yuchenlin@synology.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Thu, 1 Nov 2018 19:54:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20181024064008.26535-5-yuchenlin@synology.com> Subject: Re: [PATCH 4/4] OvmfPkg: simply use the Bochs interface for vmsvga X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2018 18:55:03 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Yu-chen Lin, On 24/10/18 8:40, yuchenlin@synology.com wrote: > From: yuchenlin > > BAR | std vga | vmsvga > --------------------------------- > 0 | Framebuffer | I/O space > 1 | Reserved | Framebuffer > 2 | MMIO | FIFO > > Because of the PCI BARs difference between std vga and > vmsvga, we can not simply recognize the "QEMU VMWare SVGA" > as the QEMU_VIDEO_BOCHS_MMIO variant. > > Instead, we remain variant QEMU_VIDEO_VMWARE_SVGA, and use > it for: > > (1) Get framebuffer from correct PCI BAR > (2) Prevent using BAR2 for MMIO > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: yuchenlin > --- > OvmfPkg/QemuVideoDxe/Driver.c | 16 +++++++++++++++- > OvmfPkg/QemuVideoDxe/Gop.c | 3 ++- > OvmfPkg/QemuVideoDxe/Qemu.h | 2 ++ > 3 files changed, 19 insertions(+), 2 deletions(-) > > diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c > index 2304afd1e6..a1785c2285 100644 > --- a/OvmfPkg/QemuVideoDxe/Driver.c > +++ b/OvmfPkg/QemuVideoDxe/Driver.c > @@ -16,6 +16,7 @@ > > #include "Qemu.h" > #include > +#include > > EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding = { > QemuVideoControllerDriverSupported, > @@ -69,6 +70,12 @@ QEMU_VIDEO_CARD gQemuVideoCardList[] = { > 0x1050, > QEMU_VIDEO_BOCHS_MMIO, > L"QEMU VirtIO VGA" > + },{ > + PCI_CLASS_DISPLAY_VGA, > + VMWARE_PCI_VENDOR_ID_VMWARE, > + VMWARE_PCI_DEVICE_ID_VMWARE_SVGA2, > + QEMU_VIDEO_VMWARE_SVGA, > + L"QEMU VMWare SVGA" Looks OK. > },{ > 0 /* end of list */ > } > @@ -256,6 +263,11 @@ QemuVideoControllerDriverStart ( > goto ClosePciIo; > } > Private->Variant = Card->Variant; > + Private->FrameBufferVramBarIndex = PCI_BAR_IDX0; > + if (Private->Variant == QEMU_VIDEO_VMWARE_SVGA) { > + Private->FrameBufferVramBarIndex = PCI_BAR_IDX1; OK, but why not use an 'else' clause? > + } > + > > // > // IsQxl is based on the detected Card->Variant, which at a later point might > @@ -320,7 +332,8 @@ QemuVideoControllerDriverStart ( > // Check if accessing the bochs interface works. > // > if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO || > - Private->Variant == QEMU_VIDEO_BOCHS) { > + Private->Variant == QEMU_VIDEO_BOCHS || > + Private->Variant == QEMU_VIDEO_VMWARE_SVGA) { > UINT16 BochsId; > BochsId = BochsRead(Private, VBE_DISPI_INDEX_ID); > if ((BochsId & 0xFFF0) != VBE_DISPI_ID0) { > @@ -383,6 +396,7 @@ QemuVideoControllerDriverStart ( > break; > case QEMU_VIDEO_BOCHS_MMIO: > case QEMU_VIDEO_BOCHS: > + case QEMU_VIDEO_VMWARE_SVGA: > Status = QemuVideoBochsModeSetup (Private, IsQxl); > break; > default: > diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c > index d490fa7a2e..3abc5eeb36 100644 > --- a/OvmfPkg/QemuVideoDxe/Gop.c > +++ b/OvmfPkg/QemuVideoDxe/Gop.c > @@ -60,7 +60,7 @@ QemuVideoCompleteModeData ( > > Private->PciIo->GetBarAttributes ( > Private->PciIo, > - 0, > + Private->FrameBufferVramBarIndex, OK > NULL, > (VOID**) &FrameBufDesc > ); > @@ -177,6 +177,7 @@ Routine Description: > break; > case QEMU_VIDEO_BOCHS_MMIO: > case QEMU_VIDEO_BOCHS: > + case QEMU_VIDEO_VMWARE_SVGA: > InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->InternalModeIndex]); > break; > default: > diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h > index d7da761705..3aac9eeca6 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; > > typedef struct { > @@ -120,6 +121,7 @@ typedef struct { > QEMU_VIDEO_VARIANT Variant; > FRAME_BUFFER_CONFIGURE *FrameBufferBltConfigure; > UINTN FrameBufferBltConfigureSize; > + UINT8 FrameBufferVramBarIndex; > } QEMU_VIDEO_PRIVATE_DATA; > > /// >