diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0716-drm-amdgpu-cleanup-uvd_v6_0_ring_test_ring.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0716-drm-amdgpu-cleanup-uvd_v6_0_ring_test_ring.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0716-drm-amdgpu-cleanup-uvd_v6_0_ring_test_ring.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0716-drm-amdgpu-cleanup-uvd_v6_0_ring_test_ring.patch new file mode 100644 index 00000000..af51a186 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0716-drm-amdgpu-cleanup-uvd_v6_0_ring_test_ring.patch @@ -0,0 +1,56 @@ +From 47e7dac94748e2b4b3f6e69499fa1d0ee78d8d3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 30 Oct 2018 13:06:22 +0100 +Subject: [PATCH 0716/2940] drm/amdgpu: cleanup uvd_v6_0_ring_test_ring +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Accidentially missed during the last cleanup. + +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/uvd_v6_0.c | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +index 234bc91e91a8..7df41d1c818b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +@@ -947,11 +947,9 @@ static int uvd_v6_0_ring_test_ring(struct amdgpu_ring *ring) + + WREG32(mmUVD_CONTEXT_ID, 0xCAFEDEAD); + r = amdgpu_ring_alloc(ring, 3); +- if (r) { +- DRM_ERROR("amdgpu: cp failed to lock ring %d (%d).\n", +- ring->idx, r); ++ if (r) + return r; +- } ++ + amdgpu_ring_write(ring, PACKET0(mmUVD_CONTEXT_ID, 0)); + amdgpu_ring_write(ring, 0xDEADBEEF); + amdgpu_ring_commit(ring); +@@ -962,14 +960,9 @@ static int uvd_v6_0_ring_test_ring(struct amdgpu_ring *ring) + DRM_UDELAY(1); + } + +- if (i < adev->usec_timeout) { +- DRM_DEBUG("ring test on %d succeeded in %d usecs\n", +- ring->idx, i); +- } else { +- DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n", +- ring->idx, tmp); +- r = -EINVAL; +- } ++ if (i >= adev->usec_timeout) ++ r = -ETIMEDOUT; ++ + return r; + } + +-- +2.17.1 + |