diff options
author | Christian König <christian.koenig@amd.com> | 2016-03-10 15:23:29 (GMT) |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-03-14 17:43:18 (GMT) |
commit | f4247c5046cdea4e166620f41c0bd3b475e98fff (patch) | |
tree | c35d053db296120b279d6769c380a290b02aac6e /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | |
parent | 587f3c70aaf07081fb24ac035789836a3f7d9008 (diff) | |
download | linux-f4247c5046cdea4e166620f41c0bd3b475e98fff.tar.xz |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index e5f0a5e..081ee05 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -539,13 +539,6 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx, 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); if (r) { DRM_ERROR("Failed mapping the UVD message (%ld)!\n", r); |