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

drm/amdgpu: make compute timeouts consistent 



For kernel compute queues, align the timeout with
other kernel queues (10 sec).  This had previously
been set higher for OpenCL when it used kernel
queues, but now OpenCL uses KFD user queues which
don't have a timeout limitation. This also aligns
with SR-IOV which already used a shorter timeout.

Additionally the longer timeout negatively impacts
the user experience with kernel queues for interactive
applications.

Reviewed-by: default avatarKent Russell <kent.russell@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 991f2e0c

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

+2 −10
Original line number Diff line number Diff line
@@ -4220,18 +4220,10 @@ 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 60000 for compute jobs.

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

	 * jobs are 60000 by default.

	 * By default timeout for jobs is 10 sec

	 */

	adev->gfx_timeout = msecs_to_jiffies(10000);

	adev->compute_timeout = adev->gfx_timeout = msecs_to_jiffies(10000);

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

	if (amdgpu_sriov_vf(adev))

		adev->compute_timeout = amdgpu_sriov_is_pp_one_vf(adev) ?

					msecs_to_jiffies(60000) : msecs_to_jiffies(10000);

	else

		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

+5 −5
Original line number Diff line number Diff line
@@ -362,11 +362,11 @@ module_param_named(svm_default_granularity, amdgpu_svm_default_granularity, uint 
 *   The second one is for Compute. The third and fourth ones are

 *   for SDMA and Video.

 *

 * By default(with no lockup_timeout settings), the timeout for all non-compute(GFX, SDMA and Video)

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

 * By default(with no lockup_timeout settings), the timeout for all jobs is 10000.

 */

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

MODULE_PARM_DESC(lockup_timeout,

		 "GPU lockup timeout in ms (default: 10000 for all jobs. "

		 "0: keep default value. negative: infinity timeout), 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);