Commit 67387dfe authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: change the default timeout for kernel compute queues 



Change to 60s.  This matches what we already do in virtualization.
Infinite timeout can lead to deadlocks in the kernel.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a8f76887

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

+3 −5
Original line number Diff line number Diff line
@@ -3167,8 +3167,8 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev) 
	int ret = 0;



	/*

	 * By default timeout for non compute jobs is 10000.

	 * And there is no timeout enforced on compute jobs.

	 * By default timeout for non compute jobs is 10000

	 * and 60000 for compute jobs.

	 * In SR-IOV or passthrough mode, timeout for compute

	 * jobs are 60000 by default.

	 */
@@ -3177,10 +3177,8 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev) 
	if (amdgpu_sriov_vf(adev))

		adev->compute_timeout = amdgpu_sriov_is_pp_one_vf(adev) ?

					msecs_to_jiffies(60000) : msecs_to_jiffies(10000);

	else if (amdgpu_passthrough(adev))

		adev->compute_timeout =  msecs_to_jiffies(60000);

	else

		adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;

		adev->compute_timeout =  msecs_to_jiffies(60000);



	if (strnlen(input, AMDGPU_MAX_TIMEOUT_PARAM_LENGTH)) {

		while ((timeout_setting = strsep(&input, ",")) &&

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

+2 −2
Original line number Diff line number Diff line
@@ -287,9 +287,9 @@ module_param_named(msi, amdgpu_msi, int, 0444); 
 *   for SDMA and Video.

 *

 * 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.

 * jobs is 10000. The timeout for compute is 60000.

 */

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

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

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

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

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