From 6d7a76595d0a0f98ebeaba244580bd585b340cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 21 Dec 2023 01:24:49 -0500 Subject: [PATCH] winsys/amdgpu: remove dependency_flags parameter from cs_add_fence_dependency Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_fence.c | 2 +- src/gallium/include/winsys/radeon_winsys.h | 5 +---- src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 3 +-- src/gallium/winsys/radeon/drm/radeon_drm_cs.c | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_fence.c b/src/gallium/drivers/radeonsi/si_fence.c index 3913737e313..cb0035a8316 100644 --- a/src/gallium/drivers/radeonsi/si_fence.c +++ b/src/gallium/drivers/radeonsi/si_fence.c @@ -170,7 +170,7 @@ static void si_add_fence_dependency(struct si_context *sctx, struct pipe_fence_h { struct radeon_winsys *ws = sctx->ws; - ws->cs_add_fence_dependency(&sctx->gfx_cs, fence, 0); + ws->cs_add_fence_dependency(&sctx->gfx_cs, fence); } static void si_add_syncobj_signal(struct si_context *sctx, struct pipe_fence_handle *fence) diff --git a/src/gallium/include/winsys/radeon_winsys.h b/src/gallium/include/winsys/radeon_winsys.h index 7c61be2c3c7..22d10cbe370 100644 --- a/src/gallium/include/winsys/radeon_winsys.h +++ b/src/gallium/include/winsys/radeon_winsys.h @@ -675,11 +675,8 @@ struct radeon_winsys { /** * Add a fence dependency to the CS, so that the CS will wait for * the fence before execution. - * - * \param dependency_flags Bitmask of RADEON_DEPENDENCY_* */ - void (*cs_add_fence_dependency)(struct radeon_cmdbuf *cs, struct pipe_fence_handle *fence, - unsigned dependency_flags); + void (*cs_add_fence_dependency)(struct radeon_cmdbuf *cs, struct pipe_fence_handle *fence); /** * Signal a syncobj when the CS finishes execution. diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 7260e43de6a..613744bd849 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -1210,8 +1210,7 @@ static void add_fence_to_list(struct amdgpu_fence_list *fences, } static void amdgpu_cs_add_fence_dependency(struct radeon_cmdbuf *rws, - struct pipe_fence_handle *pfence, - unsigned dependency_flags) + struct pipe_fence_handle *pfence) { struct amdgpu_cs *acs = amdgpu_cs(rws); struct amdgpu_cs_context *cs = acs->csc; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c index 0d5bd68b12e..243a819c58a 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c @@ -847,8 +847,7 @@ static struct pipe_fence_handle *radeon_drm_cs_get_next_fence(struct radeon_cmdb static void radeon_drm_cs_add_fence_dependency(struct radeon_cmdbuf *cs, - struct pipe_fence_handle *fence, - unsigned dependency_flags) + struct pipe_fence_handle *fence) { /* TODO: Handle the following unlikely multi-threaded scenario: *