From af7abc512c422183a761ce3d687086abe282fa74 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 12 Sep 2016 17:48:18 +0100 Subject: loader: remove loader_get_driver_for_fd() driver_type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reminiscent from the pre-loader days, were we had multiple instances of the loader logic in separate places and one could build a "GALLIUM_ONLY" version. Since that is no longer the case and the loaders (glx/egl/gbm) do not (and should not) require to know any classic/gallium specific we can drop the argument and the related code. Signed-off-by: Emil Velikov Reviewed-by: Axel Davy Reviewed-by: Nicolai Hähnle --- src/loader/loader.c | 8 +------- src/loader/loader.h | 5 +---- src/loader/pci_id_driver_map.h | 23 +++++++++++------------ 3 files changed, 13 insertions(+), 23 deletions(-) (limited to 'src/loader') diff --git a/src/loader/loader.c b/src/loader/loader.c index bb0c392cf7c..fdcd6eca80e 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -378,14 +378,11 @@ loader_get_device_name_for_fd(int fd) } char * -loader_get_driver_for_fd(int fd, unsigned driver_types) +loader_get_driver_for_fd(int fd) { int vendor_id, chip_id, i, j; char *driver = NULL; - if (!driver_types) - driver_types = _LOADER_GALLIUM | _LOADER_DRI; - if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) { #if HAVE_LIBDRM @@ -410,9 +407,6 @@ loader_get_driver_for_fd(int fd, unsigned driver_types) if (vendor_id != driver_map[i].vendor_id) continue; - if (!(driver_types & driver_map[i].driver_types)) - continue; - if (driver_map[i].predicate && !driver_map[i].predicate(fd)) continue; diff --git a/src/loader/loader.h b/src/loader/loader.h index 055dc786892..d404f5b67fc 100644 --- a/src/loader/loader.h +++ b/src/loader/loader.h @@ -33,9 +33,6 @@ extern "C" { /* Helpers to figure out driver and device name, eg. from pci-id, etc. */ -#define _LOADER_DRI (1 << 0) -#define _LOADER_GALLIUM (1 << 1) - int loader_open_device(const char *); @@ -43,7 +40,7 @@ int loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id); char * -loader_get_driver_for_fd(int fd, unsigned driver_types); +loader_get_driver_for_fd(int fd); char * loader_get_device_name_for_fd(int fd); diff --git a/src/loader/pci_id_driver_map.h b/src/loader/pci_id_driver_map.h index cab69fb87f4..343fc346acf 100644 --- a/src/loader/pci_id_driver_map.h +++ b/src/loader/pci_id_driver_map.h @@ -72,20 +72,19 @@ static const struct { const char *driver; const int *chip_ids; int num_chips_ids; - unsigned driver_types; int (*predicate)(int fd); } driver_map[] = { - { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids), _LOADER_DRI | _LOADER_GALLIUM }, - { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids), _LOADER_DRI | _LOADER_GALLIUM }, - { 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids), _LOADER_DRI }, - { 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids), _LOADER_DRI }, - { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids), _LOADER_GALLIUM }, - { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids), _LOADER_GALLIUM }, - { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids), _LOADER_GALLIUM}, - { 0x10de, "nouveau_vieux", NULL, -1, _LOADER_DRI, is_nouveau_vieux }, - { 0x10de, "nouveau", NULL, -1, _LOADER_GALLIUM }, - { 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids), _LOADER_GALLIUM }, - { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids), _LOADER_GALLIUM }, + { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) }, + { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) }, + { 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) }, + { 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) }, + { 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) }, + { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) }, { 0x0000, NULL, NULL, 0 }, }; -- cgit v1.2.3