Skip to contentSkip to conversation

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

PATCH Superseded [email protected] 3 participants 4 messages Apr 3, 2025 – Apr 8, 2025

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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 0xb0 or later
2. DPM indicates SDMA reset is supported

---
 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..9a2a5eb93763 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 >= 0xb0) && 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 2/2 drm/amdgpu: Enable TMZ support for GC 11.0.0

Add IP_VERSION(11, 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: [PATCH 2/2] drm/amdgpu: Enable TMZ support for GC 11.0.0

Quoted 2 lines · On Thu, Apr 3, 2025 at 5:44 AM [email protected] <[email protected]> wrote:

Add IP_VERSION(11, 0, 0) to the list of GPU generations that support TMZ.

Are you sure about that? TMZ will only work with user queues on gfx11 dGPUs.

Alex

Quoted 21 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +1 -1
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

#3 lore raw
In reply to [email protected]
Quoted 2 lines · On 4/3/2025 3:13 PM, [email protected] wrote:

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

This is not correct the version. Firmware team mentioned Rev 15.

Thanks,
Lijo

Quoted 22 lines

2. DPM indicates SDMA reset is supported

---
 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..9a2a5eb93763 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 >= 0xb0) && amdgpu_dpm_reset_sdma_is_supported(adev))
+			adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
+		break;
 	default:
 		break;
 	}