diff options
| author | Michel Dänzer <[email protected]> | 2019-10-07 12:02:14 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2019-10-08 09:02:34 +0000 |
| commit | 3b8aeb09069a6767820d41950f13b822e2320e50 (patch) | |
| tree | 0faa930012e4531eba90d6c266da1335a5b007a1 | |
| parent | a0c930d2844df038eefe2b67d4a7d7ee322ea396 (diff) | |
loader: Simplify handling of the radeonsi driver
The list of AMD/ATI devices supported by radeon/r200/r300/r600 is
complete, so anything else must use radeonsi.
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/loader/loader.c | 9 | ||||
| -rw-r--r-- | src/loader/pci_id_driver_map.h | 8 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/loader/loader.c b/src/loader/loader.c index c828105c951..171b67f4752 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -486,15 +486,6 @@ loader_get_driver_for_fd(int fd) } } - driver = loader_get_kernel_driver_name(fd); - bool is_amdgpu = driver && strcmp(driver, "amdgpu") == 0; - free(driver); - - if (is_amdgpu) - driver = strdup("radeonsi"); - else - driver = NULL; - out: log_(driver ? _LOADER_DEBUG : _LOADER_WARNING, "pci id for fd %d: %04x:%04x, driver %s\n", diff --git a/src/loader/pci_id_driver_map.h b/src/loader/pci_id_driver_map.h index f71548a1c4e..a05fb2c273e 100644 --- a/src/loader/pci_id_driver_map.h +++ b/src/loader/pci_id_driver_map.h @@ -62,12 +62,6 @@ static const int r600_chip_ids[] = { #undef CHIPSET }; -static const int radeonsi_chip_ids[] = { -#define CHIPSET(chip, family) chip, -#include "pci_ids/radeonsi_pci_ids.h" -#undef CHIPSET -}; - static const int virtio_gpu_chip_ids[] = { #define CHIPSET(chip, name, family) chip, #include "pci_ids/virtio_gpu_pci_ids.h" @@ -97,7 +91,7 @@ static const struct { { 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) }, { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) }, { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) }, - { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) }, + { 0x1002, "radeonsi", NULL, -1 }, { 0x10de, "nouveau_vieux", NULL, -1, is_nouveau_vieux }, { 0x10de, "nouveau", NULL, -1, }, { 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) }, |