Module: Mesa Branch: main Commit: d0c845ecb02bc9cecbeea6dffd887d375df32d31 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0c845ecb02bc9cecbeea6dffd887d375df32d31
Author: Eric Engestrom <[email protected]> Date: Mon Mar 27 17:18:48 2023 +0100 freedreno: 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/auxiliary/target-helpers/drm_helper.h | 4 ++-- src/gallium/targets/dri/dri.sym | 2 +- src/gallium/winsys/freedreno/drm/freedreno_drm_public.h | 5 +++-- src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c | 2 +- src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h index b1524c192e5..323832ecc5a 100644 --- a/src/gallium/auxiliary/target-helpers/drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/drm_helper.h @@ -264,7 +264,7 @@ pipe_msm_create_screen(int fd, const struct pipe_screen_config *config) { struct pipe_screen *screen; - screen = fd_drm_screen_create(fd, NULL, config); + screen = fd_drm_screen_create_renderonly(fd, NULL, config); return screen ? debug_screen_wrap(screen) : NULL; } @@ -292,7 +292,7 @@ pipe_virtio_gpu_create_screen(int fd, const struct pipe_screen_config *config) /* Try native guest driver(s) first, and then fallback to virgl: */ #ifdef GALLIUM_FREEDRENO if (!screen) - screen = fd_drm_screen_create(fd, NULL, config); + screen = fd_drm_screen_create_renderonly(fd, NULL, config); #endif #ifdef GALLIUM_VIRGL if (!screen) diff --git a/src/gallium/targets/dri/dri.sym b/src/gallium/targets/dri/dri.sym index 7f7a93b02ff..d4ffb588e05 100644 --- a/src/gallium/targets/dri/dri.sym +++ b/src/gallium/targets/dri/dri.sym @@ -5,7 +5,7 @@ nouveau_drm_screen_create; radeon_drm_winsys_create; amdgpu_winsys_create; - fd_drm_screen_create; + fd_drm_screen_create_renderonly; ac_init_shared_llvm_once; local: *; diff --git a/src/gallium/winsys/freedreno/drm/freedreno_drm_public.h b/src/gallium/winsys/freedreno/drm/freedreno_drm_public.h index a15f6cf8683..24f45d0c815 100644 --- a/src/gallium/winsys/freedreno/drm/freedreno_drm_public.h +++ b/src/gallium/winsys/freedreno/drm/freedreno_drm_public.h @@ -5,7 +5,8 @@ struct pipe_screen; struct renderonly; -struct pipe_screen *fd_drm_screen_create(int drmFD, struct renderonly *ro, - const struct pipe_screen_config *config); +struct pipe_screen *fd_drm_screen_create_renderonly(int drmFD, + struct renderonly *ro, + const struct pipe_screen_config *config); #endif diff --git a/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c b/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c index b4ffa3f70f6..074951f9a3f 100644 --- a/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c +++ b/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c @@ -32,7 +32,7 @@ #include "freedreno/freedreno_screen.h" struct pipe_screen * -fd_drm_screen_create(int fd, struct renderonly *ro, +fd_drm_screen_create_renderonly(int fd, struct renderonly *ro, const struct pipe_screen_config *config) { return u_pipe_screen_lookup_or_create(fd, config, ro, fd_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 7211c082264..523c30fc3de 100644 --- a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c +++ b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c @@ -96,7 +96,7 @@ struct pipe_screen *kmsro_drm_screen_create(int fd, ro->gpu_fd = drmOpenWithType("msm", NULL, DRM_NODE_RENDER); if (ro->gpu_fd >= 0) { ro->create_for_resource = renderonly_create_kms_dumb_buffer_for_resource; - screen = fd_drm_screen_create(ro->gpu_fd, ro, config); + screen = fd_drm_screen_create_renderonly(ro->gpu_fd, ro, config); if (!screen) goto out_free;
