Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: fix UVD suspend and resume for VI APU" failed to apply to 4.2-stable tree

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

Subsystems (3)
Stable branch DRM drivers Radeon and amdgpu DRM drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.2-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 1f4452105ce39786be13b4636251377a30d1286a Mon Sep 17 00:00:00 2001

From: Leo Liu <[email protected]>
Date: Fri, 11 Sep 2015 17:09:57 -0400
Subject: [PATCH] drm/amdgpu: fix UVD suspend and resume for VI APU
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

User space passed the same handle before suspend and after resume, so we have remove the session and handle destroy, and keep the firmware untouched.

Signed-off-by Leo Liu <[email protected]>
Reviewed-by Christian König <[email protected]>
Cc [email protected]
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +12 -8
index a7622efef506..7e9934fa4193 100644
@@ -214,10 +214,12 @@ static int uvd_v6_0_suspend(void *handle)
 	int r;
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-	r = amdgpu_uvd_suspend(adev);
-	if (r)
-		return r;
-
+	/* Skip this for APU for now */
+	if (!(adev->flags & AMD_IS_APU)) {
+		r = amdgpu_uvd_suspend(adev);
+		if (r)
+			return r;
+	}
 	r = uvd_v6_0_hw_fini(adev);
 	if (r)
 		return r;

@@ -230,10 +232,12 @@ static int uvd_v6_0_resume(void *handle)
 	int r;
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-	r = amdgpu_uvd_resume(adev);
-	if (r)
-		return r;
-
+	/* Skip this for APU for now */
+	if (!(adev->flags & AMD_IS_APU)) {
+		r = amdgpu_uvd_resume(adev);
+		if (r)
+			return r;
+	}
 	r = uvd_v6_0_hw_init(adev);
 	if (r)
 		return r;