From c079a206ad9b48919d2649e6ca4747d3a067987e Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 11 Oct 2016 19:39:25 +0100
Subject: [PATCH] gallium: rename drm_driver_descriptor::{, driver_}name
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Historically we use "device name" for the name of the kernel module and
"driver name" for the dri/other driver.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---
 .../auxiliary/pipe-loader/pipe_loader_drm.c   | 30 +++++++++----------
 .../include/state_tracker/drm_driver.h        |  6 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index cf70524f39e..1ad2f132c82 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -89,7 +89,7 @@ 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,
     },
@@ -99,58 +99,58 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
      * it.
      */
     {
-        .name = "i965",
+        .driver_name = "i965",
         .create_screen = pipe_vc4_create_screen,
         .configuration = configuration_query,
     },
 #endif
     {
-        .name = "i965",
+        .driver_name = "i965",
         .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 = "r300",
         .create_screen = pipe_r300_create_screen,
         .configuration = configuration_query,
     },
     {
-        .name = "r600",
+        .driver_name = "r600",
         .create_screen = pipe_r600_create_screen,
         .configuration = configuration_query,
     },
     {
-        .name = "radeonsi",
+        .driver_name = "radeonsi",
         .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 = "kgsl",
         .create_screen = pipe_freedreno_create_screen,
         .configuration = configuration_query,
     },
     {
-        .name = "msm",
+        .driver_name = "msm",
         .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,
     },
@@ -182,7 +182,7 @@ pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd)
 
 #ifdef GALLIUM_STATIC_TARGETS
    for (int i = 0; i < ARRAY_SIZE(driver_descriptors); i++) {
-      if (strcmp(driver_descriptors[i].name, ddev->base.driver_name) == 0) {
+      if (strcmp(driver_descriptors[i].driver_name, ddev->base.driver_name) == 0) {
          ddev->dd = &driver_descriptors[i];
          break;
       }
@@ -197,8 +197,8 @@ pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd)
    ddev->dd = (const struct drm_driver_descriptor *)
       util_dl_get_proc_address(ddev->lib, "driver_descriptor");
 
-   /* sanity check on the name */
-   if (!ddev->dd || strcmp(ddev->dd->name, ddev->base.driver_name) != 0)
+   /* sanity check on the driver name */
+   if (!ddev->dd || strcmp(ddev->dd->driver_name, ddev->base.driver_name) != 0)
       goto fail;
 #endif
 
diff --git a/src/gallium/include/state_tracker/drm_driver.h b/src/gallium/include/state_tracker/drm_driver.h
index 06f41e72998..deccfb5a17d 100644
--- a/src/gallium/include/state_tracker/drm_driver.h
+++ b/src/gallium/include/state_tracker/drm_driver.h
@@ -88,7 +88,7 @@ struct drm_driver_descriptor
    /**
     * Identifying prefix/suffix of the binary, used by the pipe-loader.
     */
-   const char *name;
+   const char *driver_name;
 
    /**
     * Create a pipe srcreen.
@@ -113,9 +113,9 @@ extern struct drm_driver_descriptor driver_descriptor;
 /**
  * Instantiate a drm_driver_descriptor struct.
  */
-#define DRM_DRIVER_DESCRIPTOR(name_str, func, conf) \
+#define DRM_DRIVER_DESCRIPTOR(driver_name_str, func, conf) \
 struct drm_driver_descriptor driver_descriptor = {             \
-   .name = name_str,                                           \
+   .driver_name = driver_name_str,                             \
    .create_screen = func,                                      \
    .configuration = (conf),				       \
 };
-- 
2.30.2