Merge Mesa 19.2.8

1 files changed, 11 insertions, 8 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/target-helpers/drm_helper_public.h b/lib/mesa/src/gallium/auxiliary/target-helpers/drm_helper_public.h
index 750ed0933..99018f0df 100644
--- a/lib/mesa/src/gallium/auxiliary/target-helpers/drm_helper_public.h
+++ b/lib/mesa/src/gallium/auxiliary/target-helpers/drm_helper_public.h
@@ -1,17 +1,19 @@
 #ifndef _DRM_HELPER_PUBLIC_H
 #define _DRM_HELPER_PUBLIC_H
 
-enum drm_conf;
-struct drm_conf_ret;
-
 struct pipe_screen;
 struct pipe_screen_config;
 
+const char *iris_driconf_xml;
+const char *radeonsi_driconf_xml;
+const char *v3d_driconf_xml;
+const char *virgl_driconf_xml;
+
 struct pipe_screen *
 pipe_i915_create_screen(int fd, const struct pipe_screen_config *config);
 
 struct pipe_screen *
-pipe_ilo_create_screen(int fd, const struct pipe_screen_config *config);
+pipe_iris_create_screen(int fd, const struct pipe_screen_config *config);
 
 struct pipe_screen *
 pipe_nouveau_create_screen(int fd, const struct pipe_screen_config *config);
@@ -24,8 +26,6 @@ pipe_r600_create_screen(int fd, const struct pipe_screen_config *config);
 
 struct pipe_screen *
 pipe_radeonsi_create_screen(int fd, const struct pipe_screen_config *config);
-const struct drm_conf_ret *
-pipe_radeonsi_configuration_query(enum drm_conf conf);
 
 struct pipe_screen *
 pipe_vmwgfx_create_screen(int fd, const struct pipe_screen_config *config);
@@ -43,6 +43,9 @@ struct pipe_screen *
 pipe_vc4_create_screen(int fd, const struct pipe_screen_config *config);
 
 struct pipe_screen *
+pipe_panfrost_create_screen(int fd, const struct pipe_screen_config *config);
+
+struct pipe_screen *
 pipe_kmsro_create_screen(int fd, const struct pipe_screen_config *config);
 
 struct pipe_screen *
@@ -54,7 +57,7 @@ pipe_imx_drm_create_screen(int fd, const struct pipe_screen_config *config);
 struct pipe_screen *
 pipe_tegra_create_screen(int fd, const struct pipe_screen_config *config);
 
-const struct drm_conf_ret *
-pipe_default_configuration_query(enum drm_conf conf);
+struct pipe_screen *
+pipe_lima_create_screen(int fd, const struct pipe_screen_config *config);
 
 #endif /* _DRM_HELPER_PUBLIC_H */