diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0389-drm-amdgpu-stop-waiting-on-UVD-messages-before-mappi.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0389-drm-amdgpu-stop-waiting-on-UVD-messages-before-mappi.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0389-drm-amdgpu-stop-waiting-on-UVD-messages-before-mappi.patch b/common/recipes-kernel/linux/files/0389-drm-amdgpu-stop-waiting-on-UVD-messages-before-mappi.patch new file mode 100644 index 00000000..42daf16b --- /dev/null +++ b/common/recipes-kernel/linux/files/0389-drm-amdgpu-stop-waiting-on-UVD-messages-before-mappi.patch @@ -0,0 +1,39 @@ +From de275afd2e8b1ea9b985643743868e55ef11820a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Thu, 10 Mar 2016 16:23:29 +0100 +Subject: [PATCH 0389/1110] drm/amdgpu: stop waiting on UVD messages before + mapping them +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +index c00df2f..aa8bdd4 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +@@ -543,13 +543,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); +-- +2.7.4 + |