* [PATCH 2/3] drm/amdgpu/sdma5.2: enable queue resets unconditionally
2026-02-03 17:05 [PATCH 1/3] drm/amdgpu/sdma5: enable queue resets unconditionally Alex Deucher
@ 2026-02-03 17:05 ` Alex Deucher
2026-02-03 17:05 ` [PATCH 3/3] drm/amdgpu/sdma6: " Alex Deucher
2026-02-04 1:43 ` [PATCH 1/3] drm/amdgpu/sdma5: " Zhang, Jesse(Jie)
2 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2026-02-03 17:05 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Jesse Zhang
There is no firmware version dependency. This also
enables sdma queue resets on all SDMA 5.2.x based
chips.
Fixes: 59fd50b8663b ("drm/amdgpu: Add sysfs interface for sdma reset mask")
Cc: Jesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index a57fe976cccaf..d607906bf2119 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -1346,25 +1346,9 @@ static int sdma_v5_2_sw_init(struct amdgpu_ip_block *ip_block)
adev->sdma.supported_reset =
amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
- switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
- case IP_VERSION(5, 2, 0):
- case IP_VERSION(5, 2, 2):
- case IP_VERSION(5, 2, 3):
- case IP_VERSION(5, 2, 4):
- if ((adev->sdma.instance[0].fw_version >= 76) &&
- !amdgpu_sriov_vf(adev) &&
- !adev->debug_disable_gpu_ring_reset)
- adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
- break;
- case IP_VERSION(5, 2, 5):
- if ((adev->sdma.instance[0].fw_version >= 34) &&
- !amdgpu_sriov_vf(adev) &&
- !adev->debug_disable_gpu_ring_reset)
- adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
- break;
- default:
- break;
- }
+ if (!amdgpu_sriov_vf(adev) &&
+ !adev->debug_disable_gpu_ring_reset)
+ adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
/* Allocate memory for SDMA IP Dump buffer */
ptr = kcalloc(adev->sdma.num_instances * reg_count, sizeof(uint32_t), GFP_KERNEL);
--
2.52.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] drm/amdgpu/sdma6: enable queue resets unconditionally
2026-02-03 17:05 [PATCH 1/3] drm/amdgpu/sdma5: enable queue resets unconditionally Alex Deucher
2026-02-03 17:05 ` [PATCH 2/3] drm/amdgpu/sdma5.2: " Alex Deucher
@ 2026-02-03 17:05 ` Alex Deucher
2026-02-04 1:43 ` [PATCH 1/3] drm/amdgpu/sdma5: " Zhang, Jesse(Jie)
2 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2026-02-03 17:05 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Jesse Zhang
There is no firmware version dependency. This also
enables sdma queue resets on all SDMA 6.x based
chips.
Fixes: 59fd50b8663b ("drm/amdgpu: Add sysfs interface for sdma reset mask")
Cc: Jesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index 210ea6ba6212f..6070345ed91ad 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -1368,18 +1368,9 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
adev->sdma.supported_reset =
amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
- switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
- case IP_VERSION(6, 0, 0):
- case IP_VERSION(6, 0, 2):
- case IP_VERSION(6, 0, 3):
- if ((adev->sdma.instance[0].fw_version >= 21) &&
- !amdgpu_sriov_vf(adev) &&
- !adev->debug_disable_gpu_ring_reset)
- adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
- break;
- default:
- break;
- }
+ if (!amdgpu_sriov_vf(adev) &&
+ !adev->debug_disable_gpu_ring_reset)
+ adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
if (amdgpu_sdma_ras_sw_init(adev)) {
dev_err(adev->dev, "Failed to initialize sdma ras block!\n");
--
2.52.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH 1/3] drm/amdgpu/sdma5: enable queue resets unconditionally
2026-02-03 17:05 [PATCH 1/3] drm/amdgpu/sdma5: enable queue resets unconditionally Alex Deucher
2026-02-03 17:05 ` [PATCH 2/3] drm/amdgpu/sdma5.2: " Alex Deucher
2026-02-03 17:05 ` [PATCH 3/3] drm/amdgpu/sdma6: " Alex Deucher
@ 2026-02-04 1:43 ` Zhang, Jesse(Jie)
2 siblings, 0 replies; 4+ messages in thread
From: Zhang, Jesse(Jie) @ 2026-02-04 1:43 UTC (permalink / raw)
To: Deucher, Alexander, amd-gfx@lists.freedesktop.org; +Cc: Deucher, Alexander
[AMD Official Use Only - AMD Internal Distribution Only]
Series is:
Reviewed-by: Jesse.Zhang <Jesse.zhang@amd.com>
> -----Original Message-----
> From: Alex Deucher <alexander.deucher@amd.com>
> Sent: Wednesday, February 4, 2026 1:05 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Jesse(Jie)
> <Jesse.Zhang@amd.com>
> Subject: [PATCH 1/3] drm/amdgpu/sdma5: enable queue resets unconditionally
>
> There is no firmware version dependency.
>
> Fixes: 59fd50b8663b ("drm/amdgpu: Add sysfs interface for sdma reset mask")
> Cc: Jesse Zhang <Jesse.Zhang@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15 +++------------
> 1 file changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> index edb1e4d3f9292..afc22843f7940 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> @@ -1427,18 +1427,9 @@ static int sdma_v5_0_sw_init(struct amdgpu_ip_block
> *ip_block)
>
> adev->sdma.supported_reset =
> amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
> - switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
> - case IP_VERSION(5, 0, 0):
> - case IP_VERSION(5, 0, 2):
> - case IP_VERSION(5, 0, 5):
> - if ((adev->sdma.instance[0].fw_version >= 35) &&
> - !amdgpu_sriov_vf(adev) &&
> - !adev->debug_disable_gpu_ring_reset)
> - adev->sdma.supported_reset |=
> AMDGPU_RESET_TYPE_PER_QUEUE;
> - break;
> - default:
> - break;
> - }
> + if (!amdgpu_sriov_vf(adev) &&
> + !adev->debug_disable_gpu_ring_reset)
> + adev->sdma.supported_reset |=
> AMDGPU_RESET_TYPE_PER_QUEUE;
>
> /* Allocate memory for SDMA IP Dump buffer */
> ptr = kcalloc(adev->sdma.num_instances * reg_count, sizeof(uint32_t),
> GFP_KERNEL);
> --
> 2.52.0
^ permalink raw reply [flat|nested] 4+ messages in thread