OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

winsys/amdgpu: remove dependency_flags parameter from cs_add_fence_dependency

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26643>
This commit is contained in:
Marek Olšák
2023-12-21 01:24:49 -05:00
committed by Marge Bot
parent 6ac0b4ef05
commit 6d7a76595d
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_fence.c
View File

@@ -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)

5
src/gallium/include/winsys/radeon_winsys.h
View File

@@ -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.

3
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
View File

@@ -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;

3
src/gallium/winsys/radeon/drm/radeon_drm_cs.c
View File

@@ -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:
*