Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: enable tmz by default for GC 10.3.7" failed to apply to 5.18-stable tree

PATCH [email protected] 1 participant 1 message Jun 13, 2022

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 5.18-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 ------------------

From 371017309a9f1725bfd3283afe61efa4ac34d30c Mon Sep 17 00:00:00 2001
From: Sunil Khatri <[email protected]>
Date: Mon, 30 May 2022 23:24:09 +0530
Subject: [PATCH] drm/amdgpu: enable tmz by default for GC 10.3.7

Add IP GC 10.3.7 in the list of target to have
tmz enabled by default.

Signed-off-by Sunil Khatri <[email protected]>
Reviewed-by Alexander Deucher <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
Cc [email protected] # 5.18.x
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +2 -2
index 798c56214a23..aebc384531ac 100644
@@ -518,6 +518,8 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
 	case IP_VERSION(9, 1, 0):
 	/* RENOIR looks like RAVEN */
 	case IP_VERSION(9, 3, 0):
+	/* GC 10.3.7 */
+	case IP_VERSION(10, 3, 7):
 		if (amdgpu_tmz == 0) {
 			adev->gmc.tmz_enabled = false;
 			dev_info(adev->dev,

@@ -540,8 +542,6 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
 	case IP_VERSION(10, 3, 1):
 	/* YELLOW_CARP*/
 	case IP_VERSION(10, 3, 3):
-	/* GC 10.3.7 */
-	case IP_VERSION(10, 3, 7):
 		/* Don't enable it by default yet.
 		 */
 		if (amdgpu_tmz < 1) {