| From 7fb2238888be8ca211843bf9f65feb152ccedf87 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 3 Feb 2026 11:53:51 -0500 |
| Subject: drm/amdgpu/sdma6: enable queue resets unconditionally |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| [ Upstream commit 56423871e9eef1dd069bddef895207fa5ce275fe ] |
| |
| 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> |
| Reviewed-by: Jesse.Zhang <Jesse.zhang@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 2170400449872..6809c6d4be5b1 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c |
| @@ -1351,18 +1351,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.51.0 |
| |
