niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/radeon: use dma_resv_wait_timeout() instead of manually waiting

Browse source 
Don't touch the exclusive fence manually here, but rather use the
general dma_resv function. We did that for better hw reset handling but
this doesn't necessary work correctly.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deuche <alexander.deucher@amd.com>
Acked-by: Nirmoy Das <nirmoy.das@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211028132630.2330-6-christian.koenig@amd.com
This commit is contained in:
Christian König 2021-10-27 13:30:40 +02:00
parent c29d679722
commit 89aae41d74
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/radeon/radeon_uvd.c
View file

@ -469,7 +469,6 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
{ {
int32_t *msg, msg_type, handle; int32_t *msg, msg_type, handle;
unsigned img_size = 0; unsigned img_size = 0;
struct dma_fence *f;
void *ptr; void *ptr;
int i, r; int i, r;
@ -479,13 +478,11 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
return -EINVAL; return -EINVAL;
} }
f = dma_resv_excl_fence(bo->tbo.base.resv); r = dma_resv_wait_timeout(bo->tbo.base.resv, false, false,
if (f) { MAX_SCHEDULE_TIMEOUT);
r = radeon_fence_wait((struct radeon_fence *)f, false); if (r <= 0) {
if (r) { DRM_ERROR("Failed waiting for UVD message (%d)!\n", r);
DRM_ERROR("Failed waiting for UVD message (%d)!\n", r); return r ? r : -ETIME;
return r;
}
} }
r = radeon_bo_kmap(bo, &ptr); r = radeon_bo_kmap(bo, &ptr);