Skip to content

Commit 314d30a

Browse files
committed
drm/amdgpu/sdma5.2: enable queue resets unconditionally
There is no firmware version dependency. This also enables sdma queue resets on all SDMA 5.2.x based chips. Fixes: 59fd50b ("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>
1 parent 46a2cb7 commit 314d30a

1 file changed

Lines changed: 3 additions & 19 deletions

File tree

drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,25 +1342,9 @@ static int sdma_v5_2_sw_init(struct amdgpu_ip_block *ip_block)
13421342

13431343
adev->sdma.supported_reset =
13441344
amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
1345-
switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
1346-
case IP_VERSION(5, 2, 0):
1347-
case IP_VERSION(5, 2, 2):
1348-
case IP_VERSION(5, 2, 3):
1349-
case IP_VERSION(5, 2, 4):
1350-
if ((adev->sdma.instance[0].fw_version >= 76) &&
1351-
!amdgpu_sriov_vf(adev) &&
1352-
!adev->debug_disable_gpu_ring_reset)
1353-
adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
1354-
break;
1355-
case IP_VERSION(5, 2, 5):
1356-
if ((adev->sdma.instance[0].fw_version >= 34) &&
1357-
!amdgpu_sriov_vf(adev) &&
1358-
!adev->debug_disable_gpu_ring_reset)
1359-
adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
1360-
break;
1361-
default:
1362-
break;
1363-
}
1345+
if (!amdgpu_sriov_vf(adev) &&
1346+
!adev->debug_disable_gpu_ring_reset)
1347+
adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
13641348

13651349
/* Allocate memory for SDMA IP Dump buffer */
13661350
ptr = kcalloc(adev->sdma.num_instances * reg_count, sizeof(uint32_t), GFP_KERNEL);

0 commit comments

Comments
 (0)