| From 79cbd5b6ee2616770f7f555fbad86067c5c7ef49 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 3 Feb 2026 11:51:45 -0500 |
| Subject: drm/amdgpu/sdma5: enable queue resets unconditionally |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| [ Upstream commit 46a2cb7d24f21132e970cab52359210c3f5ea3c6 ] |
| |
| There is no firmware version dependency. |
| |
| 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_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 8ddc4df06a1fd..45e2933214a80 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c |
| @@ -1424,18 +1424,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.51.0 |
| |
