fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

loader: Simplify handling of the radeonsi driver

Browse source 
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 <marek.olsak@amd.com>
This commit is contained in:
Michel Dänzer 2019-10-07 12:02:14 +02:00 • committed by Michel Dänzer
parent a0c930d284
commit 3b8aeb0906
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/loader/loader.c
View file

@ -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",

8
src/loader/pci_id_driver_map.h
View file

@ -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) },