iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: use the reservation obj wait for the UVD msg

Browse Source 
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2015-08-06 20:44:47 +02:00 committed by Alex Deucher
parent 3cdb8119d9
commit 713293b825
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
View File

@ -513,7 +513,6 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx,
{ {
struct amdgpu_device *adev = ctx->parser->adev; struct amdgpu_device *adev = ctx->parser->adev;
int32_t *msg, msg_type, handle; int32_t *msg, msg_type, handle;
struct fence *f;
void *ptr; void *ptr;
int i, r; int i, r;
@ -523,14 +522,12 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx,
return -EINVAL; return -EINVAL;
} }
f = reservation_object_get_excl(bo->tbo.resv); r = reservation_object_wait_timeout_rcu(bo->tbo.resv, true, false,
if (f) { MAX_SCHEDULE_TIMEOUT);
r = amdgpu_fence_wait((struct amdgpu_fence *)f, false);
if (r) { if (r) {
DRM_ERROR("Failed waiting for UVD message (%d)!\n", r); DRM_ERROR("Failed waiting for UVD message (%d)!\n", r);
return r; return r;
} }
}
r = amdgpu_bo_kmap(bo, &ptr); r = amdgpu_bo_kmap(bo, &ptr);
if (r) { if (r) {