aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0555-drm-amdgpu-fix-the-UVD-suspend-sequence-order.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0555-drm-amdgpu-fix-the-UVD-suspend-sequence-order.patch')
-rw-r--r--common/recipes-kernel/linux/files/0555-drm-amdgpu-fix-the-UVD-suspend-sequence-order.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/common/recipes-kernel/linux/files/0555-drm-amdgpu-fix-the-UVD-suspend-sequence-order.patch b/common/recipes-kernel/linux/files/0555-drm-amdgpu-fix-the-UVD-suspend-sequence-order.patch
deleted file mode 100644
index bc2241cc..00000000
--- a/common/recipes-kernel/linux/files/0555-drm-amdgpu-fix-the-UVD-suspend-sequence-order.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 2bd188d0167227932be3cf5b033c0e600b01291f Mon Sep 17 00:00:00 2001
-From: Leo Liu <leo.liu@amd.com>
-Date: Fri, 11 Sep 2015 14:22:18 -0400
-Subject: [PATCH 0555/1050] drm/amdgpu: fix the UVD suspend sequence order
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes suspend issues with UVD.
-
-Signed-off-by: Leo Liu <leo.liu@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Cc: stable@vger.kernel.org
----
- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 4 ++--
- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 4 ++--
- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-index 5fac5da..ed50dd7 100644
---- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-@@ -224,11 +224,11 @@ static int uvd_v4_2_suspend(void *handle)
- int r;
- struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-
-- r = uvd_v4_2_hw_fini(adev);
-+ r = amdgpu_uvd_suspend(adev);
- if (r)
- return r;
-
-- r = amdgpu_uvd_suspend(adev);
-+ r = uvd_v4_2_hw_fini(adev);
- if (r)
- return r;
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
-index 2d5c59c..9ad8b99 100644
---- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
-@@ -220,11 +220,11 @@ static int uvd_v5_0_suspend(void *handle)
- int r;
- struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-
-- r = uvd_v5_0_hw_fini(adev);
-+ r = amdgpu_uvd_suspend(adev);
- if (r)
- return r;
-
-- r = amdgpu_uvd_suspend(adev);
-+ r = uvd_v5_0_hw_fini(adev);
- if (r)
- return r;
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
-index d9f553f..a7622ef 100644
---- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
-@@ -214,11 +214,11 @@ static int uvd_v6_0_suspend(void *handle)
- int r;
- struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-
-- r = uvd_v6_0_hw_fini(adev);
-+ r = amdgpu_uvd_suspend(adev);
- if (r)
- return r;
-
-- r = amdgpu_uvd_suspend(adev);
-+ r = uvd_v6_0_hw_fini(adev);
- if (r)
- return r;
-
---
-1.9.1
-