Skip to contentSkip to conversation

Patch "drm/amdgpu: fix the UVD suspend sequence order" has been added to the 4.2-stable tree

PATCH [email protected] 1 participant 1 message Oct 17, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/amdgpu: fix the UVD suspend sequence order

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-amdgpu-fix-the-uvd-suspend-sequence-order.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 2bd188d0167227932be3cf5b033c0e600b01291f Mon Sep 17 00:00:00 2001

From: Leo Liu <[email protected]>
Date: Fri, 11 Sep 2015 14:22:18 -0400
Subject: drm/amdgpu: fix the UVD suspend sequence order
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Leo Liu <[email protected]>

commit 2bd188d0167227932be3cf5b033c0e600b01291f upstream.

Fixes suspend issues with UVD.

---
 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(-)
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +2 -2
@@ -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;
 
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +2 -2
@@ -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;
 
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +2 -2
@@ -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;
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/drm-amdgpu-fix-the-uvd-suspend-sequence-order.patch queue-4.2/drm-amdgpu-disable-uvd-pg.patch queue-4.2/drm-amdgpu-make-uvd-handle-checking-more-strict.patch