Module: Mesa Branch: main Commit: b5082223beec0a1259a91fde596b7cee545afac4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5082223beec0a1259a91fde596b7cee545afac4
Author: Eric Engestrom <[email protected]> Date: Mon Mar 27 17:20:11 2023 +0100 lima: change create_renderonly signature to uniformize it Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emma Anholt <[email protected]> Reviewed-by: Vasily Khoruzhick <[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/lima/drm/lima_drm_public.h | 4 +++- src/gallium/winsys/lima/drm/lima_drm_winsys.c | 5 +++-- 3 files changed, 7 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 523c30fc3de..368b91468d5 100644 --- a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c +++ b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c @@ -121,7 +121,7 @@ struct pipe_screen *kmsro_drm_screen_create(int fd, ro->gpu_fd = drmOpenWithType("lima", NULL, DRM_NODE_RENDER); if (ro->gpu_fd >= 0) { ro->create_for_resource = renderonly_create_kms_dumb_buffer_for_resource; - screen = lima_drm_screen_create_renderonly(ro); + screen = lima_drm_screen_create_renderonly(ro->gpu_fd, ro, config); if (!screen) goto out_free; diff --git a/src/gallium/winsys/lima/drm/lima_drm_public.h b/src/gallium/winsys/lima/drm/lima_drm_public.h index 06ca46499d4..96faec814e9 100644 --- a/src/gallium/winsys/lima/drm/lima_drm_public.h +++ b/src/gallium/winsys/lima/drm/lima_drm_public.h @@ -30,6 +30,8 @@ struct pipe_screen; struct renderonly; struct pipe_screen *lima_drm_screen_create(int drmFD); -struct pipe_screen *lima_drm_screen_create_renderonly(struct renderonly *ro); +struct pipe_screen *lima_drm_screen_create_renderonly(int fd, + struct renderonly *ro, + const struct pipe_screen_config *config); #endif /* __LIMA_DRM_PUBLIC_H__ */ diff --git a/src/gallium/winsys/lima/drm/lima_drm_winsys.c b/src/gallium/winsys/lima/drm/lima_drm_winsys.c index b3d8887d4e3..589f150143e 100644 --- a/src/gallium/winsys/lima/drm/lima_drm_winsys.c +++ b/src/gallium/winsys/lima/drm/lima_drm_winsys.c @@ -37,7 +37,8 @@ lima_drm_screen_create(int fd) } struct pipe_screen * -lima_drm_screen_create_renderonly(struct renderonly *ro) +lima_drm_screen_create_renderonly(int fd, struct renderonly *ro, + const struct pipe_screen_config *config) { - return lima_screen_create(os_dupfd_cloexec(ro->gpu_fd), NULL, ro); + return lima_screen_create(os_dupfd_cloexec(fd), config, ro); }
