Commit 314d30ad authored by Alex Deucher's avatar Alex Deucher
Browse files

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: 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 46a2cb7d

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

+3 −19
Original line number Diff line number Diff line
@@ -1342,25 +1342,9 @@ static int sdma_v5_2_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(5, 2, 0):

	case IP_VERSION(5, 2, 2):

	case IP_VERSION(5, 2, 3):

	case IP_VERSION(5, 2, 4):

		if ((adev->sdma.instance[0].fw_version >= 76) &&

		    !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;

	case IP_VERSION(5, 2, 5):

		if ((adev->sdma.instance[0].fw_version >= 34) &&

		    !amdgpu_sriov_vf(adev) &&

		    !adev->debug_disable_gpu_ring_reset)

			adev->sdma.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

		break;

	default:

		break;

	}



	/* Allocate memory for SDMA IP Dump buffer */

	ptr = kcalloc(adev->sdma.num_instances * reg_count, sizeof(uint32_t), GFP_KERNEL);