From 5627708e5f447d0e360bbc9eb8d1c4e58c5046d0 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lureau Date: Fri, 12 Feb 2016 22:52:07 +0100 Subject: [PATCH] dri2: add virtio-gpu pci ids MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add virtio-gpu legacy + 1.0 pci ids, allowing them to use modesetting + glamor with dri2. Signed-off-by: Marc-André Lureau Reviewed-by: Dave Airlie --- hw/xfree86/dri2/pci_ids/Makefile.am | 1 + hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 7 +++++++ hw/xfree86/dri2/pci_ids/virtio_gpu_pci_ids.h | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 hw/xfree86/dri2/pci_ids/virtio_gpu_pci_ids.h diff --git a/hw/xfree86/dri2/pci_ids/Makefile.am b/hw/xfree86/dri2/pci_ids/Makefile.am index c5111082b..69fe8c40d 100644 --- a/hw/xfree86/dri2/pci_ids/Makefile.am +++ b/hw/xfree86/dri2/pci_ids/Makefile.am @@ -8,4 +8,5 @@ EXTRA_DIST = \ r600_pci_ids.h \ radeon_pci_ids.h \ radeonsi_pci_ids.h \ + virtio_gpu_pci_ids.h \ vmwgfx_pci_ids.h diff --git a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h index 8a97c6f31..da7ea1c1e 100644 --- a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h +++ b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h @@ -51,6 +51,12 @@ static const int radeonsi_chip_ids[] = { #undef CHIPSET }; +static const int virtio_gpu_chip_ids[] = { +#define CHIPSET(chip, name, family) chip, +#include "pci_ids/virtio_gpu_pci_ids.h" +#undef CHIPSET +}; + static const int vmwgfx_chip_ids[] = { #define CHIPSET(chip, name, family) chip, #include "pci_ids/vmwgfx_pci_ids.h" @@ -73,6 +79,7 @@ static const struct { { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) }, { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) }, { 0x10de, "nouveau", NULL, -1 }, + { 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) }, { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) }, { 0x0000, NULL, NULL, 0 }, }; diff --git a/hw/xfree86/dri2/pci_ids/virtio_gpu_pci_ids.h b/hw/xfree86/dri2/pci_ids/virtio_gpu_pci_ids.h new file mode 100644 index 000000000..9232cd288 --- /dev/null +++ b/hw/xfree86/dri2/pci_ids/virtio_gpu_pci_ids.h @@ -0,0 +1,2 @@ +CHIPSET(0x0010, VIRTGL, VIRTGL) +CHIPSET(0x1050, VIRTGL, VIRTGL)