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 <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
---
 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

Reply via email to