From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=kraxel@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D4F092063D751 for ; Thu, 17 May 2018 02:23:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 20EC040200A3 for ; Thu, 17 May 2018 09:23:21 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-49.ams2.redhat.com [10.36.116.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id B53AA2166BAD; Thu, 17 May 2018 09:23:20 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 230861750D; Thu, 17 May 2018 11:23:20 +0200 (CEST) From: Gerd Hoffmann To: edk2-devel@lists.01.org Date: Thu, 17 May 2018 11:21:32 +0200 Message-Id: <20180517092133.24600-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 17 May 2018 09:23:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 17 May 2018 09:23:21 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' Subject: [PATCH 1/2] OvmfPkg/QemuVideoDxe: Add SubClass field to QEMU_VIDEO_CARD X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 09:23:23 -0000 Then check for PCI_CLASS_DISPLAY_VGA using the new field. This allows to enable/disable non-vga display classes per card entry. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Gerd Hoffmann --- OvmfPkg/QemuVideoDxe/Qemu.h | 1 + OvmfPkg/QemuVideoDxe/Driver.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h index 7fbb25b3ef..bc49f867a4 100644 --- a/OvmfPkg/QemuVideoDxe/Qemu.h +++ b/OvmfPkg/QemuVideoDxe/Qemu.h @@ -96,6 +96,7 @@ typedef enum { } QEMU_VIDEO_VARIANT; typedef struct { + UINT8 SubClass; UINT16 VendorId; UINT16 DeviceId; QEMU_VIDEO_VARIANT Variant; diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c index 0dce80e59b..2d7ad43cb3 100644 --- a/OvmfPkg/QemuVideoDxe/Driver.c +++ b/OvmfPkg/QemuVideoDxe/Driver.c @@ -30,36 +30,43 @@ EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding = { QEMU_VIDEO_CARD gQemuVideoCardList[] = { { + PCI_CLASS_DISPLAY_VGA, CIRRUS_LOGIC_VENDOR_ID, CIRRUS_LOGIC_5430_DEVICE_ID, QEMU_VIDEO_CIRRUS_5430, L"Cirrus 5430" },{ + PCI_CLASS_DISPLAY_VGA, CIRRUS_LOGIC_VENDOR_ID, CIRRUS_LOGIC_5430_ALTERNATE_DEVICE_ID, QEMU_VIDEO_CIRRUS_5430, L"Cirrus 5430" },{ + PCI_CLASS_DISPLAY_VGA, CIRRUS_LOGIC_VENDOR_ID, CIRRUS_LOGIC_5446_DEVICE_ID, QEMU_VIDEO_CIRRUS_5446, L"Cirrus 5446" },{ + PCI_CLASS_DISPLAY_VGA, 0x1234, 0x1111, QEMU_VIDEO_BOCHS_MMIO, L"QEMU Standard VGA" },{ + PCI_CLASS_DISPLAY_VGA, 0x1b36, 0x0100, QEMU_VIDEO_BOCHS, L"QEMU QXL VGA" },{ + PCI_CLASS_DISPLAY_VGA, 0x1af4, 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, @@ -71,6 +78,7 @@ QEMU_VIDEO_CARD gQemuVideoCardList[] = { static QEMU_VIDEO_CARD* QemuVideoDetect( + IN UINT8 SubClass, IN UINT16 VendorId, IN UINT16 DeviceId ) @@ -78,7 +86,8 @@ QemuVideoDetect( UINTN Index = 0; while (gQemuVideoCardList[Index].VendorId != 0) { - if (gQemuVideoCardList[Index].VendorId == VendorId && + if (gQemuVideoCardList[Index].SubClass == SubClass && + gQemuVideoCardList[Index].VendorId == VendorId && gQemuVideoCardList[Index].DeviceId == DeviceId) { return gQemuVideoCardList + Index; } @@ -141,10 +150,10 @@ QemuVideoControllerDriverSupported ( } Status = EFI_UNSUPPORTED; - if (!IS_PCI_VGA (&Pci)) { + if (!IS_PCI_DISPLAY (&Pci)) { goto Done; } - Card = QemuVideoDetect(Pci.Hdr.VendorId, Pci.Hdr.DeviceId); + Card = QemuVideoDetect(Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId); if (Card != NULL) { DEBUG ((EFI_D_INFO, "QemuVideo: %s detected\n", Card->Name)); Status = EFI_SUCCESS; @@ -243,7 +252,7 @@ QemuVideoControllerDriverStart ( // // Determine card variant. // - Card = QemuVideoDetect(Pci.Hdr.VendorId, Pci.Hdr.DeviceId); + Card = QemuVideoDetect(Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId); if (Card == NULL) { Status = EFI_DEVICE_ERROR; goto ClosePciIo; -- 2.9.3