diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4839-drm-amdgpu-update-uvd_v6_0_ring_vm_funcs-to-use-new-.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4839-drm-amdgpu-update-uvd_v6_0_ring_vm_funcs-to-use-new-.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4839-drm-amdgpu-update-uvd_v6_0_ring_vm_funcs-to-use-new-.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4839-drm-amdgpu-update-uvd_v6_0_ring_vm_funcs-to-use-new-.patch new file mode 100644 index 00000000..019bece0 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4839-drm-amdgpu-update-uvd_v6_0_ring_vm_funcs-to-use-new-.patch @@ -0,0 +1,41 @@ +From f9f2cf203abe830330ceb2445846cb6d787da1c6 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Thu, 28 Jun 2018 12:32:27 -0500 +Subject: [PATCH 4839/5725] drm/amdgpu: update uvd_v6_0_ring_vm_funcs to use + new nop packet + +Was missed when updating the uvd 6 module. + +Fixes: 1aac3c9180 (drm/amdgpu: fix insert nop for UVD6 ring) +Reviewed-by: Leo Liu <leo.liu@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Cc: stable@vger.kernel.org +Signed-off-by: Raveendra Talabattula <raveendra.talabattula@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +index 37bb32b..6f008a0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +@@ -1588,7 +1588,6 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = { + static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = { + .type = AMDGPU_RING_TYPE_UVD, + .align_mask = 0xf, +- .nop = PACKET0(mmUVD_NO_OP, 0), + .support_64bit_ptrs = false, + .get_rptr = uvd_v6_0_ring_get_rptr, + .get_wptr = uvd_v6_0_ring_get_wptr, +@@ -1608,7 +1607,7 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = { + .emit_hdp_invalidate = uvd_v6_0_ring_emit_hdp_invalidate, + .test_ring = uvd_v6_0_ring_test_ring, + .test_ib = amdgpu_uvd_ring_test_ib, +- .insert_nop = amdgpu_ring_insert_nop, ++ .insert_nop = uvd_v6_0_ring_insert_nop, + .pad_ib = amdgpu_ring_generic_pad_ib, + .begin_use = amdgpu_uvd_ring_begin_use, + .end_use = amdgpu_uvd_ring_end_use, +-- +2.7.4 + |