diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index afca50b17cd..0737f459e89 100644
--- a/src/gallium/drivers/v3d/v3d_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -874,6 +874,14 @@ v3d_screen_get_disk_shader_cache(struct pipe_screen *pscreen)
         return screen->disk_cache;
 }
 
+static int
+v3d_screen_get_fd(struct pipe_screen *pscreen)
+{
+        struct v3d_screen *screen = v3d_screen(pscreen);
+
+        return screen->fd;
+}
+
 struct pipe_screen *
 v3d_screen_create(int fd, const struct pipe_screen_config *config,
                   struct renderonly *ro)
@@ -884,6 +892,7 @@ v3d_screen_create(int fd, const struct pipe_screen_config *config,
         pscreen = &screen->base;
 
         pscreen->destroy = v3d_screen_destroy;
+        pscreen->get_screen_fd = v3d_screen_get_fd;
         pscreen->get_param = v3d_screen_get_param;
         pscreen->get_paramf = v3d_screen_get_paramf;
         pscreen->get_shader_param = v3d_screen_get_shader_param;
diff --git a/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c b/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
index 63681e1ba11..daa5910f152 100644
--- a/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
+++ b/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,
                                  const struct pipe_screen_config *config)
 {
-   return v3d_screen_create(ro->gpu_fd, config, ro);
+   return u_pipe_screen_lookup_or_create(ro->gpu_fd, config,
+                                         ro, v3d_screen_create);
 }