Module: Mesa Branch: main Commit: 6caa166ffeda903a73d437bae6a2dfdd03d5f75f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6caa166ffeda903a73d437bae6a2dfdd03d5f75f
Author: Eric Engestrom <[email protected]> Date: Mon Mar 27 17:21:40 2023 +0100 panfrost: change create_renderonly signature to uniformize it Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22144> --- src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c | 2 +- src/gallium/winsys/panfrost/drm/panfrost_drm_public.h | 5 ++++- src/gallium/winsys/panfrost/drm/panfrost_drm_winsys.c | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c index 368b91468d5..f046831e5f8 100644 --- a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c +++ b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c @@ -109,7 +109,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 = panfrost_drm_screen_create_renderonly(ro); + screen = panfrost_drm_screen_create_renderonly(ro->gpu_fd, ro, config); if (!screen) goto out_free; diff --git a/src/gallium/winsys/panfrost/drm/panfrost_drm_public.h b/src/gallium/winsys/panfrost/drm/panfrost_drm_public.h index 8568ffd8de5..67749b5582a 100644 --- a/src/gallium/winsys/panfrost/drm/panfrost_drm_public.h +++ b/src/gallium/winsys/panfrost/drm/panfrost_drm_public.h @@ -28,9 +28,12 @@ #include <stdbool.h> struct pipe_screen; +struct pipe_screen_config; struct renderonly; struct pipe_screen *panfrost_drm_screen_create(int drmFD); -struct pipe_screen *panfrost_drm_screen_create_renderonly(struct renderonly *ro); +struct pipe_screen *panfrost_drm_screen_create_renderonly(int fd, + struct renderonly *ro, + const struct pipe_screen_config *config); #endif /* __PAN_DRM_PUBLIC_H__ */ diff --git a/src/gallium/winsys/panfrost/drm/panfrost_drm_winsys.c b/src/gallium/winsys/panfrost/drm/panfrost_drm_winsys.c index 1c3afa1ed5d..fbe1cd40f88 100644 --- a/src/gallium/winsys/panfrost/drm/panfrost_drm_winsys.c +++ b/src/gallium/winsys/panfrost/drm/panfrost_drm_winsys.c @@ -119,9 +119,11 @@ panfrost_drm_screen_create(int fd) } struct pipe_screen * -panfrost_drm_screen_create_renderonly(struct renderonly *ro) +panfrost_drm_screen_create_renderonly(int fd, + struct renderonly *ro, + const struct pipe_screen_config *config) { ro->create_for_resource = panfrost_create_kms_dumb_buffer_for_resource; - return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(ro->gpu_fd), NULL, + return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(fd), config, ro, panfrost_create_screen); }
