|
 |
91849c |
From 2a9268e4a0ba7b062ded4d361be3119d887aac41 Mon Sep 17 00:00:00 2001
|
|
|
91849c |
From: Adam Jackson <ajax@redhat.com>
|
|
|
91849c |
Date: Tue, 3 Sep 2019 11:20:58 -0400
|
|
|
91849c |
Subject: [PATCH xserver] dri2: Set fallback driver names for Intel and AMD
|
|
|
91849c |
chips
|
|
|
91849c |
MIME-Version: 1.0
|
|
|
91849c |
Content-Type: text/plain; charset=UTF-8
|
|
|
91849c |
Content-Transfer-Encoding: 8bit
|
|
|
91849c |
|
|
|
91849c |
i965 and radeonsi, respectively, are the drivers that have been
|
|
|
91849c |
receiving new hardware support. It's really silly to need to update the
|
|
|
91849c |
server side to know specific new devices IDs every time a new ASIC comes
|
|
|
91849c |
out.
|
|
|
91849c |
|
|
|
91849c |
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
|
|
|
91849c |
---
|
|
|
91849c |
hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 9 ++-------
|
|
|
91849c |
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
|
91849c |
|
|
|
91849c |
diff --git a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
|
|
|
91849c |
index da7ea1c1e..04f372279 100644
|
|
|
91849c |
--- a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
|
|
|
91849c |
+++ b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
|
|
|
91849c |
@@ -45,12 +45,6 @@ static const int r600_chip_ids[] = {
|
|
|
91849c |
#undef CHIPSET
|
|
|
91849c |
};
|
|
|
91849c |
|
|
|
91849c |
-static const int radeonsi_chip_ids[] = {
|
|
|
91849c |
-#define CHIPSET(chip, name, family) chip,
|
|
|
91849c |
-#include "pci_ids/radeonsi_pci_ids.h"
|
|
|
91849c |
-#undef CHIPSET
|
|
|
91849c |
-};
|
|
|
91849c |
-
|
|
|
91849c |
static const int virtio_gpu_chip_ids[] = {
|
|
|
91849c |
#define CHIPSET(chip, name, family) chip,
|
|
|
91849c |
#include "pci_ids/virtio_gpu_pci_ids.h"
|
|
|
91849c |
@@ -71,13 +65,14 @@ static const struct {
|
|
|
91849c |
} driver_map[] = {
|
|
|
91849c |
{ 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
|
|
|
91849c |
{ 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
|
|
|
91849c |
+ { 0x8086, "i965", NULL, -1 },
|
|
|
91849c |
#ifndef DRIVER_MAP_GALLIUM_ONLY
|
|
|
91849c |
{ 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) },
|
|
|
91849c |
{ 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) },
|
|
|
91849c |
#endif
|
|
|
91849c |
{ 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },
|
|
|
91849c |
{ 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
|
|
|
91849c |
- { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) },
|
|
|
91849c |
+ { 0x1002, "radeonsi", NULL, -1 },
|
|
|
91849c |
{ 0x10de, "nouveau", NULL, -1 },
|
|
|
91849c |
{ 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) },
|
|
|
91849c |
{ 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) },
|
|
|
91849c |
--
|
|
|
91849c |
2.23.0
|
|
|
91849c |
|