aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/4976-drm-amdgpu-remove-superflous-UVD-encode-entity.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4976-drm-amdgpu-remove-superflous-UVD-encode-entity.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/4976-drm-amdgpu-remove-superflous-UVD-encode-entity.patch105
1 files changed, 105 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4976-drm-amdgpu-remove-superflous-UVD-encode-entity.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4976-drm-amdgpu-remove-superflous-UVD-encode-entity.patch
new file mode 100644
index 00000000..7b2c91e1
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4976-drm-amdgpu-remove-superflous-UVD-encode-entity.patch
@@ -0,0 +1,105 @@
+From 0e1aaf3866482a938136af420ef95298755f389e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Wed, 18 Jul 2018 20:28:08 +0200
+Subject: [PATCH 4976/5725] drm/amdgpu: remove superflous UVD encode entity
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Not sure what that was every used for, but now it is completely unused.
+
+Reviewed-by: Leo Liu <leo.liu@amd.com>
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Acked-by: Chunming Zhou <david1.zhou@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Raveendra Talabattula <raveendra.talabattula@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 12 ------------
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 14 --------------
+ 3 files changed, 27 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
+index 8b23a1b..cae3f52 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
+@@ -48,7 +48,6 @@ struct amdgpu_uvd_inst {
+ struct amdgpu_ring ring_enc[AMDGPU_MAX_UVD_ENC_RINGS];
+ struct amdgpu_irq_src irq;
+ struct drm_sched_entity entity;
+- struct drm_sched_entity entity_enc;
+ uint32_t srbm_soft_reset;
+ };
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+index f832c5e..f6522bc 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+@@ -418,16 +418,6 @@ static int uvd_v6_0_sw_init(void *handle)
+ adev->uvd.num_enc_rings = 0;
+
+ DRM_INFO("UVD ENC is disabled\n");
+- } else {
+- struct drm_sched_rq *rq;
+- ring = &adev->uvd.inst->ring_enc[0];
+- rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
+- r = drm_sched_entity_init(&ring->sched, &adev->uvd.inst->entity_enc,
+- rq, NULL);
+- if (r) {
+- DRM_ERROR("Failed setting up UVD ENC run queue.\n");
+- return r;
+- }
+ }
+
+ r = amdgpu_uvd_resume(adev);
+@@ -463,8 +453,6 @@ static int uvd_v6_0_sw_fini(void *handle)
+ return r;
+
+ if (uvd_v6_0_enc_support(adev)) {
+- drm_sched_entity_fini(&adev->uvd.inst->ring_enc[0].sched, &adev->uvd.inst->entity_enc);
+-
+ for (i = 0; i < adev->uvd.num_enc_rings; ++i)
+ amdgpu_ring_fini(&adev->uvd.inst->ring_enc[i]);
+ }
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+index 423b74e..1fd09d0 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+@@ -389,7 +389,6 @@ static int uvd_v7_0_early_init(void *handle)
+ static int uvd_v7_0_sw_init(void *handle)
+ {
+ struct amdgpu_ring *ring;
+- struct drm_sched_rq *rq;
+ int i, j, r;
+ struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+@@ -421,17 +420,6 @@ static int uvd_v7_0_sw_init(void *handle)
+ DRM_INFO("PSP loading UVD firmware\n");
+ }
+
+- for (j = 0; j < adev->uvd.num_uvd_inst; j++) {
+- ring = &adev->uvd.inst[j].ring_enc[0];
+- rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
+- r = drm_sched_entity_init(&ring->sched, &adev->uvd.inst[j].entity_enc,
+- rq, NULL);
+- if (r) {
+- DRM_ERROR("(%d)Failed setting up UVD ENC run queue.\n", j);
+- return r;
+- }
+- }
+-
+ r = amdgpu_uvd_resume(adev);
+ if (r)
+ return r;
+@@ -484,8 +472,6 @@ static int uvd_v7_0_sw_fini(void *handle)
+ return r;
+
+ for (j = 0; j < adev->uvd.num_uvd_inst; ++j) {
+- drm_sched_entity_fini(&adev->uvd.inst[j].ring_enc[0].sched, &adev->uvd.inst[j].entity_enc);
+-
+ for (i = 0; i < adev->uvd.num_enc_rings; ++i)
+ amdgpu_ring_fini(&adev->uvd.inst[j].ring_enc[i]);
+ }
+--
+2.7.4
+