1 files changed, 0 insertions, 60 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4484-drm-amdgpu-fix-insert-nop-for-UVD4.2-ring.patch b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4484-drm-amdgpu-fix-insert-nop-for-UVD4.2-ring.patch
deleted file mode 100644
index eac551e7..00000000
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4484-drm-amdgpu-fix-insert-nop-for-UVD4.2-ring.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From f2dfc71461d4a2b779f56ccfcf295bad73cc1e41 Mon Sep 17 00:00:00 2001
-From: Leo Liu <leo.liu@amd.com>
-Date: Thu, 17 May 2018 13:54:21 -0400
-Subject: [PATCH 4484/5725] drm/amdgpu: fix insert nop for UVD4.2 ring
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-NO_OP register should be writen to 0
-
-Signed-off-by: Leo Liu <leo.liu@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-index 4ee0c10..d2f6caa 100644
---- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-@@ -550,6 +550,18 @@ static void uvd_v4_2_ring_emit_ib(struct amdgpu_ring *ring,
- 	amdgpu_ring_write(ring, ib->length_dw);
- }
- 
-+static void uvd_v4_2_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count)
-+{
-+	int i;
-+
-+	WARN_ON(ring->wptr % 2 || count % 2);
-+
-+	for (i = 0; i < count / 2; i++) {
-+		amdgpu_ring_write(ring, PACKET0(mmUVD_NO_OP, 0));
-+		amdgpu_ring_write(ring, 0);
-+	}
-+}
-+
- /**
-  * uvd_v4_2_mc_resume - memory controller programming
-  *
-@@ -759,7 +771,6 @@ static const struct amd_ip_funcs uvd_v4_2_ip_funcs = {
- static const struct amdgpu_ring_funcs uvd_v4_2_ring_funcs = {
- 	.type = AMDGPU_RING_TYPE_UVD,
- 	.align_mask = 0xf,
--	.nop = PACKET0(mmUVD_NO_OP, 0),
- 	.support_64bit_ptrs = false,
- 	.get_rptr = uvd_v4_2_ring_get_rptr,
- 	.get_wptr = uvd_v4_2_ring_get_wptr,
-@@ -776,7 +787,7 @@ static const struct amdgpu_ring_funcs uvd_v4_2_ring_funcs = {
- 	.emit_hdp_invalidate = uvd_v4_2_ring_emit_hdp_invalidate,
- 	.test_ring = uvd_v4_2_ring_test_ring,
- 	.test_ib = amdgpu_uvd_ring_test_ib,
--	.insert_nop = amdgpu_ring_insert_nop,
-+	.insert_nop = uvd_v4_2_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
-