Skip to content

Commit 5642387

Browse files
committed
drm/amdgpu/sdma6: enable queue resets unconditionally
There is no firmware version dependency. This also enables sdma queue resets on all SDMA 6.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 314d30a commit 5642387

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

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

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

13651365
adev->sdma.supported_reset =
13661366
amdgpu_get_soft_full_reset_mask(&adev->sdma.instance[0].ring);
1367-
switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
1368-
case IP_VERSION(6, 0, 0):
1369-
case IP_VERSION(6, 0, 2):
1370-
case IP_VERSION(6, 0, 3):
1371-
if ((adev->sdma.instance[0].fw_version >= 21) &&
1372-
!amdgpu_sriov_vf(adev) &&
1373-
!adev->debug_disable_gpu_ring_reset)
1374-
adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
1375-
break;
1376-
default:
1377-
break;
1378-
}
1367+
if (!amdgpu_sriov_vf(adev) &&
1368+
!adev->debug_disable_gpu_ring_reset)
1369+
adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
13791370

13801371
if (amdgpu_sdma_ras_sw_init(adev)) {
13811372
dev_err(adev->dev, "Failed to initialize sdma ras block!\n");

0 commit comments

Comments
 (0)