Commit bcccee89 authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher
Browse files

drm/amdgpu: Fix tdr3 could hang with slow compute issue 



When index is 1, need to set compute ring timeout for sriov and passthrough.

Signed-off-by: default avatarEmily Deng <Emily.Deng@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b2c18f0a

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

+4 −1
Original line number Diff line number Diff line
@@ -2622,8 +2622,11 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev) 
		 * There is only one value specified and

		 * it should apply to all non-compute jobs.

		 */

		if (index == 1)

		if (index == 1) {

			adev->sdma_timeout = adev->video_timeout = adev->gfx_timeout;

			if (amdgpu_sriov_vf(adev) || amdgpu_passthrough(adev))

				adev->compute_timeout = adev->gfx_timeout;

		}

	}



	return ret;

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

+4 −2
Original line number Diff line number Diff line
@@ -249,9 +249,11 @@ module_param_named(msi, amdgpu_msi, int, 0444); 
 * By default(with no lockup_timeout settings), the timeout for all non-compute(GFX, SDMA and Video)

 * jobs is 10000. And there is no timeout enforced on compute jobs.

 */

MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (default: 10000 for non-compute jobs and infinity timeout for compute jobs."

MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (default: for bare metal 10000 for non-compute jobs and infinity timeout for compute jobs; "

		"for passthrough or sriov, 10000 for all jobs."

		" 0: keep default value. negative: infinity timeout), "

		"format is [Non-Compute] or [GFX,Compute,SDMA,Video]");

		"format: for bare metal [Non-Compute] or [GFX,Compute,SDMA,Video]; "

		"for passthrough or sriov [all jobs] or [GFX,Compute,SDMA,Video].");

module_param_string(lockup_timeout, amdgpu_lockup_timeout, sizeof(amdgpu_lockup_timeout), 0444);



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE