Skip to contentSkip to conversation

drm/amdgpu: Enable per-queue reset for SDMA v4.4.2 on IP v9.5.0

PATCH In review [email protected] 3 participants 4 messages Apr 8, 2025 – Apr 11, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 drm/amdgpu: Enable per-queue reset for SDMA v4.4.2 on IP v9.5.0

Add support for per-queue reset on SDMA v4.4.2 when running with:
1. MEC firmware version 17 or later
2. DPM indicates SDMA reset is supported

v2: Fixed supported firmware versions (Lijo)

---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +3 -1
index 688a720bbbbd..673ecd208c6d 100644
@@ -2373,7 +2373,9 @@ static void sdma_v4_4_2_update_reset_mask(struct amdgpu_device *adev)
 			adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
 		break;
 	case IP_VERSION(9, 5, 0):
-		/*TODO: enable the queue reset flag until fw supported */
+		if ((adev->gfx.mec_fw_version >= 0xf) && amdgpu_dpm_reset_sdma_is_supported(adev))
+			adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
+		break;
 	default:
 		break;
 	}
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 2/2 drm/amdgpu: Enable TMZ support for GC 11.0.0

Add GC11.0.0 to the list of GPU generations that support TMZ.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +1 -0
index 464625282872..1eb9242436ee 100644
@@ -843,6 +843,7 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
 	case IP_VERSION(9, 3, 0):
 	/* GC 10.3.7 */
 	case IP_VERSION(10, 3, 7):
+	case IP_VERSION(11, 0, 0):
 	/* GC 11.0.1 */
 	case IP_VERSION(11, 0, 1):
 		if (amdgpu_tmz == 0) {
Signature · 1 line
2.25.1
#2 lore raw

Re: [v2 2/2] drm/amdgpu: Enable TMZ support for GC 11.0.0

[AMD Official Use Only - AMD Internal Distribution Only]

GFX11 is a dGPU. We don't currently have a way to deal with migration of encrypted buffers to system ram.

Alex
________________________________
From: [email protected] <[email protected]>
Sent: Tuesday, April 8, 2025 2:32 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Huang, Tim <[email protected]>; Lazar, Lijo <[email protected]>; Zhang, Jesse(Jie) <[email protected]>; Zhang, Jesse(Jie) <[email protected]>
Subject: [v2 2/2] drm/amdgpu: Enable TMZ support for GC 11.0.0

Add GC11.0.0 to the list of GPU generations that support TMZ.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +1 -0
index 464625282872..1eb9242436ee 100644
@@ -843,6 +843,7 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
         case IP_VERSION(9, 3, 0):
         /* GC 10.3.7 */
         case IP_VERSION(10, 3, 7):
+       case IP_VERSION(11, 0, 0):
         /* GC 11.0.1 */
         case IP_VERSION(11, 0, 1):
                 if (amdgpu_tmz == 0) {

--
2.25.1

Reviewed-by on v2 1/2
#3 lore raw
In reply to [email protected]

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Jesse,

Quoted 11 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Tuesday, April 8, 2025 2:33 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Huang, Tim <[email protected]>; Lazar, Lijo <[email protected]>; Zhang, Jesse(Jie) <[email protected]>; Zhang, Jesse(Jie) <[email protected]>
Subject: [v2 1/2] drm/amdgpu: Enable per-queue reset for SDMA v4.4.2 on IP v9.5.0

Quoted 2 lines

Add support for per-queue reset on SDMA v4.4.2 when running with:
1. MEC firmware version 17 or later

Please ensure this firmware version is aligned with code 0xf. With this addressed,

This patch is,

Quoted 31 lines

2. DPM indicates SDMA reset is supported

v2: Fixed supported firmware versions (Lijo)

---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +2 -1
index 688a720bbbbd..673ecd208c6d 100644
@@ -2373,7 +2373,9 @@ static void
 sdma_v4_4_2_update_reset_mask(struct amdgpu_device *adev)
                      adev->sdma.supported_reset |=
 AMDGPU_RESET_TYPE_PER_QUEUE;
              break;
      case IP_VERSION(9, 5, 0):
-             /*TODO: enable the queue reset flag until fw supported */
+             if ((adev->gfx.mec_fw_version >= 0xf) &&
 amdgpu_dpm_reset_sdma_is_supported(adev))
+                     adev->sdma.supported_reset |=

AMDGPU_RESET_TYPE_PER_QUEUE;

+             break;
      default:
              break;
      }

--
2.25.1