mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 00:52:01 +00:00
drm/amdgpu: stop waiting on UVD messages before mapping them
amdgpu_bo_kmap() now always waits for moves to finish. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
587f3c70aa
commit
f4247c5046
@ -539,13 +539,6 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx,
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
r = reservation_object_wait_timeout_rcu(bo->tbo.resv, true, false,
|
|
||||||
MAX_SCHEDULE_TIMEOUT);
|
|
||||||
if (r < 0) {
|
|
||||||
DRM_ERROR("Failed waiting for UVD message (%ld)!\n", r);
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
r = amdgpu_bo_kmap(bo, &ptr);
|
r = amdgpu_bo_kmap(bo, &ptr);
|
||||||
if (r) {
|
if (r) {
|
||||||
DRM_ERROR("Failed mapping the UVD message (%ld)!\n", r);
|
DRM_ERROR("Failed mapping the UVD message (%ld)!\n", r);
|
||||||
|
Loading…
Reference in New Issue
Block a user