Commit 56423871 authored by Alex Deucher's avatar Alex Deucher
Browse files

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: 59fd50b8 ("drm/amdgpu: Add sysfs interface for sdma reset mask")
Cc: Jesse Zhang <Jesse.Zhang@amd.com>
Reviewed-by: default avatarJesse.Zhang <Jesse.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 314d30ad

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

+3 −12
Original line number Diff line number Diff line
@@ -1364,18 +1364,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) &&

	if (!amdgpu_sriov_vf(adev) &&

	    !adev->debug_disable_gpu_ring_reset)

		adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

		break;

	default:

		break;

	}



	if (amdgpu_sdma_ras_sw_init(adev)) {

		dev_err(adev->dev, "Failed to initialize sdma ras block!\n");