gallium: replace drm_driver_descriptor::configuration with driconf_xml

PIPE_CAPs are better.

Reviewed-by: Kenneth Graunke <[email protected]>

7 files changed, 10 insertions, 53 deletions

diff --git a/src/gallium/targets/pipe-loader/pipe_i915.c b/src/gallium/targets/pipe-loader/pipe_i915.c
index 61429858445..b4f5a72f296 100644
--- a/src/gallium/targets/pipe-loader/pipe_i915.c
+++ b/src/gallium/targets/pipe-loader/pipe_i915.c
@@ -23,10 +23,5 @@ create_screen(int fd, const struct pipe_screen_config *config)
    return screen;
 }
 
-static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
-{
-   return NULL;
-}
-
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("i915", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("i915", NULL, create_screen)
diff --git a/src/gallium/targets/pipe-loader/pipe_msm.c b/src/gallium/targets/pipe-loader/pipe_msm.c
index 004db95e78a..43b8f0b4ea4 100644
--- a/src/gallium/targets/pipe-loader/pipe_msm.c
+++ b/src/gallium/targets/pipe-loader/pipe_msm.c
@@ -17,10 +17,5 @@ create_screen(int fd, const struct pipe_screen_config *config)
    return screen;
 }
 
-static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
-{
-   return NULL;
-}
-
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("msm", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("msm", NULL, create_screen)
diff --git a/src/gallium/targets/pipe-loader/pipe_nouveau.c b/src/gallium/targets/pipe-loader/pipe_nouveau.c
index 9adba1c85c0..06fe95624d1 100644
--- a/src/gallium/targets/pipe-loader/pipe_nouveau.c
+++ b/src/gallium/targets/pipe-loader/pipe_nouveau.c
@@ -17,10 +17,5 @@ create_screen(int fd, const struct pipe_screen_config *config)
    return screen;
 }
 
-static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
-{
-   return NULL;
-}
-
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("nouveau", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("nouveau", NULL, create_screen)
diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c
index 1c42f4e36ad..17b310ee189 100644
--- a/src/gallium/targets/pipe-loader/pipe_r300.c
+++ b/src/gallium/targets/pipe-loader/pipe_r300.c
@@ -13,10 +13,5 @@ create_screen(int fd, const struct pipe_screen_config *config)
    return sws ? debug_screen_wrap(sws->screen) : NULL;
 }
 
-static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
-{
-   return NULL;
-}
-
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("r300", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("r300", NULL, create_screen)
diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c
index f5f1c446e2d..855aa9e4bd3 100644
--- a/src/gallium/targets/pipe-loader/pipe_r600.c
+++ b/src/gallium/targets/pipe-loader/pipe_r600.c
@@ -13,10 +13,5 @@ create_screen(int fd, const struct pipe_screen_config *config)
    return rw ? debug_screen_wrap(rw->screen) : NULL;
 }
 
-static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
-{
-   return NULL;
-}
-
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("r600", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("r600", NULL, create_screen)
diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
index 09c06b380d6..5657595af19 100644
--- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c
+++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
@@ -20,22 +20,9 @@ create_screen(int fd, const struct pipe_screen_config *config)
    return rw ? debug_screen_wrap(rw->screen) : NULL;
 }
 
-static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
-{
-   static const struct drm_conf_ret xml_options_ret = {
-      .type = DRM_CONF_POINTER,
-      .val.val_pointer =
-#include "radeonsi/si_driinfo.h"
-   };
-
-   switch (conf) {
-   case DRM_CONF_XML_OPTIONS:
-      return &xml_options_ret;
-   default:
-      break;
-   }
-   return NULL;
-}
+static const char *driconf_xml =
+   #include "radeonsi/si_driinfo.h"
+   ;
 
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("radeonsi", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("radeonsi", &driconf_xml, create_screen)
diff --git a/src/gallium/targets/pipe-loader/pipe_vmwgfx.c b/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
index c4484e03344..a60a5e89814 100644
--- a/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
+++ b/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
@@ -23,10 +23,5 @@ create_screen(int fd, const struct pipe_screen_config *config)
    return screen;
 }
 
-static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
-{
-   return NULL;
-}
-
 PUBLIC
-DRM_DRIVER_DESCRIPTOR("vmwgfx", create_screen, drm_configuration)
+DRM_DRIVER_DESCRIPTOR("vmwgfx", NULL, create_screen)