Skip to content

Commit 46a2cb7

Browse files
committed
drm/amdgpu/sdma5: enable queue resets unconditionally
There is no firmware version dependency. 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 ee41e5b commit 46a2cb7

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,18 +1424,9 @@ static int sdma_v5_0_sw_init(struct amdgpu_ip_block *ip_block)
14241424

14251425
adev->sdma.supported_reset =
14261426
amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
1427-
switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
1428-
case IP_VERSION(5, 0, 0):
1429-
case IP_VERSION(5, 0, 2):
1430-
case IP_VERSION(5, 0, 5):
1431-
if ((adev->sdma.instance[0].fw_version >= 35) &&
1432-
!amdgpu_sriov_vf(adev) &&
1433-
!adev->debug_disable_gpu_ring_reset)
1434-
adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
1435-
break;
1436-
default:
1437-
break;
1438-
}
1427+
if (!amdgpu_sriov_vf(adev) &&
1428+
!adev->debug_disable_gpu_ring_reset)
1429+
adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
14391430

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

0 commit comments

Comments
 (0)