Import Mesa 23.1.9

2 files changed, 7 insertions, 4 deletions

diff --git a/lib/mesa/src/gallium/winsys/v3d/drm/v3d_drm_public.h b/lib/mesa/src/gallium/winsys/v3d/drm/v3d_drm_public.h
index c458d7395..157a3191b 100644
--- a/lib/mesa/src/gallium/winsys/v3d/drm/v3d_drm_public.h
+++ b/lib/mesa/src/gallium/winsys/v3d/drm/v3d_drm_public.h
@@ -30,7 +30,7 @@ struct renderonly;
 
 struct pipe_screen *v3d_drm_screen_create(int drmFD,
                                           const struct pipe_screen_config *config);
-struct pipe_screen *v3d_drm_screen_create_renderonly(struct renderonly *ro,
+struct pipe_screen *v3d_drm_screen_create_renderonly(int fd, struct renderonly *ro,
                                                      const struct pipe_screen_config *config);
 
 #endif /* __V3D_DRM_PUBLIC_H__ */
diff --git a/lib/mesa/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c b/lib/mesa/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
index 63681e1ba..0386cde88 100644
--- a/lib/mesa/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
+++ b/lib/mesa/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 
 #include "util/os_file.h"
+#include "util/u_screen.h"
 
 #include "v3d_drm_public.h"
 
@@ -33,12 +34,14 @@
 struct pipe_screen *
 v3d_drm_screen_create(int fd, const struct pipe_screen_config *config)
 {
-   return v3d_screen_create(os_dupfd_cloexec(fd), config, NULL);
+   return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(fd), config,
+                                         NULL, v3d_screen_create);
 }
 
 struct pipe_screen *
-v3d_drm_screen_create_renderonly(struct renderonly *ro,
+v3d_drm_screen_create_renderonly(int fd, struct renderonly *ro,
                                  const struct pipe_screen_config *config)
 {
-   return v3d_screen_create(ro->gpu_fd, config, ro);
+   return u_pipe_screen_lookup_or_create(fd, config,
+                                         ro, v3d_screen_create);
 }