From: Eric Engestrom <eric@igalia.com>
Date: Mon, 27 Mar 2023 16:13:10 +0000 (+0100)
Subject: asahi: change create_renderonly signature to uniformize it
X-Git-Tag: upstream/23.3.3~10936
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49996def65384b465a75a604d0b609382b4c3405;p=platform%2Fupstream%2Fmesa.git

asahi: change create_renderonly signature to uniformize it

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22144>
---

diff --git a/src/gallium/winsys/asahi/drm/asahi_drm_public.h b/src/gallium/winsys/asahi/drm/asahi_drm_public.h
index 85f102d..56ede24 100644
--- a/src/gallium/winsys/asahi/drm/asahi_drm_public.h
+++ b/src/gallium/winsys/asahi/drm/asahi_drm_public.h
@@ -10,9 +10,12 @@
 #include <stdbool.h>
 
 struct pipe_screen;
+struct pipe_screen_config;
 struct renderonly;
 
 struct pipe_screen *asahi_drm_screen_create(int drmFD);
-struct pipe_screen *asahi_drm_screen_create_renderonly(struct renderonly *ro);
+struct pipe_screen *
+asahi_drm_screen_create_renderonly(int fd, struct renderonly *ro,
+                                   const struct pipe_screen_config *config);
 
 #endif /* __ASAHI_DRM_PUBLIC_H__ */
diff --git a/src/gallium/winsys/asahi/drm/asahi_drm_winsys.c b/src/gallium/winsys/asahi/drm/asahi_drm_winsys.c
index e533d1c..3e6bd3c 100644
--- a/src/gallium/winsys/asahi/drm/asahi_drm_winsys.c
+++ b/src/gallium/winsys/asahi/drm/asahi_drm_winsys.c
@@ -34,8 +34,9 @@ asahi_drm_screen_create(int fd)
 }
 
 struct pipe_screen *
-asahi_drm_screen_create_renderonly(struct renderonly *ro)
+asahi_drm_screen_create_renderonly(int fd, struct renderonly *ro,
+                                   const struct pipe_screen_config *config)
 {
-   return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(ro->gpu_fd), NULL, ro,
+   return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(fd), config, ro,
                                          asahi_screen_create);
 }
diff --git a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c
index dd26120..c973816 100644
--- a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c
+++ b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c
@@ -146,7 +146,7 @@ struct pipe_screen *kmsro_drm_screen_create(int fd,
 
    if (ro->gpu_fd >= 0) {
       ro->create_for_resource = renderonly_create_kms_dumb_buffer_for_resource;
-      screen = asahi_drm_screen_create_renderonly(ro);
+      screen = asahi_drm_screen_create_renderonly(ro->gpu_fd, ro, config);
       if (!screen)
          goto out_free;