Commit 11f25c84 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Drop the hang limit parameter 



The driver doesn't resubmit jobs on hangs any more, hence drop
the hang limit parameter - amdgpu_job_hang_limit, wherever it is used.

Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Kent Russell <kent.russell@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 52f1783f

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ extern char *amdgpu_disable_cu; 
extern char *amdgpu_virtual_display;

extern uint amdgpu_pp_feature_mask;

extern uint amdgpu_force_long_training;

extern int amdgpu_job_hang_limit;

extern int amdgpu_lbpw;

extern int amdgpu_compute_multipipe;

extern int amdgpu_gpu_recovery;

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

+1 −1
Original line number Diff line number Diff line
@@ -2365,7 +2365,7 @@ static int amdgpu_device_init_schedulers(struct amdgpu_device *adev) 
		}



		r = drm_sched_init(&ring->sched, &amdgpu_sched_ops,

				   ring->num_hw_submission, amdgpu_job_hang_limit,

				   ring->num_hw_submission, 0,

				   timeout, adev->reset_domain->wq,

				   ring->sched_score, ring->name,

				   adev->dev);

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

+0 −8
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ char *amdgpu_virtual_display; 
 */

uint amdgpu_pp_feature_mask = 0xfff7bfff;

uint amdgpu_force_long_training;

int amdgpu_job_hang_limit;

int amdgpu_lbpw = -1;

int amdgpu_compute_multipipe = -1;

int amdgpu_gpu_recovery = -1; /* auto */
@@ -520,13 +519,6 @@ MODULE_PARM_DESC(virtual_display, 
		 "Enable virtual display feature (the virtual_display will be set like xxxx:xx:xx.x,x;xxxx:xx:xx.x,x)");

module_param_named(virtual_display, amdgpu_virtual_display, charp, 0444);



/**

 * DOC: job_hang_limit (int)

 * Set how much time allow a job hang and not drop it. The default is 0.

 */

MODULE_PARM_DESC(job_hang_limit, "how much time allow a job hang and not drop it (default 0)");

module_param_named(job_hang_limit, amdgpu_job_hang_limit, int ,0444);



/**

 * DOC: lbpw (int)

 * Override Load Balancing Per Watt (LBPW) support (1 = enable, 0 = disable). The default is -1 (auto, enabled).