gallium: remove unused drm_driver_descriptor::driver_name

Likely unused since day 1, although I've only checked back until the
st/dri unification with commit 29ca7d2c948 ("st/dri: merge dri/drm and
dri/sw backends")

Based on the comment, referencing drmOpenByName it's not something we
want to bring back.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 994a284385c7b2d51b5300b31422743130d89306..cf70524f39e1dc3f8b813895349743637c028a42 100644 (file)
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -90,7 +90,6 @@ configuration_query(enum drm_conf conf)
 static const struct drm_driver_descriptor driver_descriptors[] = {
     {
         .name = "i915",
-        .driver_name = "i915",
         .create_screen = pipe_i915_create_screen,
         .configuration = configuration_query,
     },
@@ -101,68 +100,57 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
      */
     {
         .name = "i965",
-        .driver_name = "vc4",
         .create_screen = pipe_vc4_create_screen,
         .configuration = configuration_query,
     },
 #endif
     {
         .name = "i965",
-        .driver_name = "i915",
         .create_screen = pipe_ilo_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "nouveau",
-        .driver_name = "nouveau",
         .create_screen = pipe_nouveau_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "r300",
-        .driver_name = "radeon",
         .create_screen = pipe_r300_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "r600",
-        .driver_name = "radeon",
         .create_screen = pipe_r600_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "radeonsi",
-        .driver_name = "radeon",
         .create_screen = pipe_radeonsi_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "vmwgfx",
-        .driver_name = "vmwgfx",
         .create_screen = pipe_vmwgfx_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "kgsl",
-        .driver_name = "freedreno",
         .create_screen = pipe_freedreno_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "msm",
-        .driver_name = "freedreno",
         .create_screen = pipe_freedreno_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "virtio_gpu",
-        .driver_name = "virtio-gpu",
         .create_screen = pipe_virgl_create_screen,
         .configuration = configuration_query,
     },
     {
         .name = "vc4",
-        .driver_name = "vc4",
         .create_screen = pipe_vc4_create_screen,
         .configuration = configuration_query,
     },

diff --git a/src/gallium/include/state_tracker/drm_driver.h b/src/gallium/include/state_tracker/drm_driver.h
index 540cc38dcb90faef829eaaa19c2461a040bf0cb9..06f41e7299837f4ed6e6bdd1c5a8749f6295241b 100644 (file)
--- a/src/gallium/include/state_tracker/drm_driver.h
+++ b/src/gallium/include/state_tracker/drm_driver.h
@@ -90,11 +90,6 @@ struct drm_driver_descriptor
     */
    const char *name;
 
-   /**
-    * Kernel driver name, as accepted by drmOpenByName.
-    */
-   const char *driver_name;
-
    /**
     * Create a pipe srcreen.
     *
@@ -103,7 +98,6 @@ struct drm_driver_descriptor
     */
    struct pipe_screen* (*create_screen)(int drm_fd);
 
-
    /**
     * Return a configuration value.
     *
@@ -119,10 +113,9 @@ extern struct drm_driver_descriptor driver_descriptor;
 /**
  * Instantiate a drm_driver_descriptor struct.
  */
-#define DRM_DRIVER_DESCRIPTOR(name_str, driver_name_str, func, conf) \
+#define DRM_DRIVER_DESCRIPTOR(name_str, func, conf) \
 struct drm_driver_descriptor driver_descriptor = {             \
    .name = name_str,                                           \
-   .driver_name = driver_name_str,                             \
    .create_screen = func,                                      \
    .configuration = (conf),                                   \
 };

diff --git a/src/gallium/targets/pipe-loader/pipe_i915.c b/src/gallium/targets/pipe-loader/pipe_i915.c
index b0da6137f3d238cdc7c59fd90386beb1e3195e30..3af8fe37475c3310ed38059e3db7a386e52d8a10 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe_i915.c
+++ b/src/gallium/targets/pipe-loader/pipe_i915.c
@@ -47,4 +47,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
 }
 
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("i915", "i915", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("i915", create_screen, drm_configuration)

diff --git a/src/gallium/targets/pipe-loader/pipe_i965.c b/src/gallium/targets/pipe-loader/pipe_i965.c
index 810dffca81223f4bc7a92d6385e45880958a6d2d..a2d8debfc9c8591d559bee22efcd1e146bd15049 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe_i965.c
+++ b/src/gallium/targets/pipe-loader/pipe_i965.c
@@ -44,4 +44,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
    return NULL;
 }
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("i965", "i915", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("i965", create_screen, drm_configuration)

diff --git a/src/gallium/targets/pipe-loader/pipe_msm.c b/src/gallium/targets/pipe-loader/pipe_msm.c
index 8a44edd22a62b0fd6b576b5755e823e47f222960..fa098e97735c908c08960e9861836714c5affec1 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe_msm.c
+++ b/src/gallium/targets/pipe-loader/pipe_msm.c
@@ -41,4 +41,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
 }
 
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("msm", "freedreno", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("msm", create_screen, drm_configuration)

diff --git a/src/gallium/targets/pipe-loader/pipe_nouveau.c b/src/gallium/targets/pipe-loader/pipe_nouveau.c
index 825b36f602e1856bc32726649938e5c8cd268e5f..d8824930b15d797659e89e582170cd0897b72f84 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe_nouveau.c
+++ b/src/gallium/targets/pipe-loader/pipe_nouveau.c
@@ -41,4 +41,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
 }
 
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("nouveau", create_screen, drm_configuration)

diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c
index 368b8c223293285c86498da7cfe1015b178eeaea..0c170853ad29d9a246a2575d40b511c91ae8a853 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe_r300.c
+++ b/src/gallium/targets/pipe-loader/pipe_r300.c
@@ -37,4 +37,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
 }
 
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("r300", create_screen, drm_configuration)

diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c
index 65b11c8ba608c3b28db0fb2eb9c0a3377c2601f9..dd2652da44f64fb0c99645d8e8e29427472233ac 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe_r600.c
+++ b/src/gallium/targets/pipe-loader/pipe_r600.c
@@ -37,4 +37,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
 }
 
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("r600", create_screen, drm_configuration)

diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
index 31077af6a0411269489b071cdc4c44702037d677..59ea82dc567576d40e65360b33b6dc03e24c8a9f 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c
+++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
@@ -43,4 +43,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
 }
 
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("radeonsi", create_screen, drm_configuration)

diff --git a/src/gallium/targets/pipe-loader/pipe_vmwgfx.c b/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
index 71015dfadb79aaab965a4deb66bafdbcd13391ae..4572327d550e20f21f1b31eee1511b3c4b84f38a 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
+++ b/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
@@ -47,4 +47,4 @@ static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
 }
 
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("vmwgfx", "vmwgfx", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("vmwgfx", create_screen, drm_configuration)