aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2966-drm-amdgpu-restore-uvd-fence-seq-in-uvd-resume.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2966-drm-amdgpu-restore-uvd-fence-seq-in-uvd-resume.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2966-drm-amdgpu-restore-uvd-fence-seq-in-uvd-resume.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2966-drm-amdgpu-restore-uvd-fence-seq-in-uvd-resume.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2966-drm-amdgpu-restore-uvd-fence-seq-in-uvd-resume.patch
new file mode 100644
index 00000000..dd4d70a5
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2966-drm-amdgpu-restore-uvd-fence-seq-in-uvd-resume.patch
@@ -0,0 +1,34 @@
+From 023a1b96a7a47e2277d3cec252d1a04da3de4ac7 Mon Sep 17 00:00:00 2001
+From: Jim Qu <Jim.Qu@amd.com>
+Date: Mon, 18 Dec 2017 10:08:38 +0800
+Subject: [PATCH 2966/4131] drm/amdgpu: restore uvd fence seq in uvd resume
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+otherwise, uvd block will be never powered up in ring begin_use()
+callback. uvd ring test will be fail in resume in rumtime pm.
+
+Change-Id: If5821c769da07b61ebc651cfdfc794377c7017c4
+Signed-off-by: Jim Qu <Jim.Qu@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+index b2b15ea..154a8e0 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+@@ -348,6 +348,8 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev)
+ ptr += le32_to_cpu(hdr->ucode_size_bytes);
+ }
+ memset_io(ptr, 0, size);
++ /* to restore uvd fence seq */
++ amdgpu_fence_driver_force_completion(&adev->uvd.ring);
+ }
+
+ return 0;
+--
+2.7.4
+