[Public] > -----Original Message----- > From: SHANMUGAM, SRINIVASAN > <SRINIVASAN.SHANMUGAM@xxxxxxx> > Sent: Wednesday, April 5, 2023 10:24 > To: Koenig, Christian <Christian.Koenig@xxxxxxx>; Deucher, Alexander > <Alexander.Deucher@xxxxxxx>; Limonciello, Mario > <Mario.Limonciello@xxxxxxx>; Russell, Kent <Kent.Russell@xxxxxxx> > Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx; SHANMUGAM, SRINIVASAN > <SRINIVASAN.SHANMUGAM@xxxxxxx> > Subject: [PATCH v3] 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: Christian König <christian.koenig@xxxxxxx> > Cc: Alex Deucher <alexander.deucher@xxxxxxx> > Cc: Mario Limonciello <mario.limonciello@xxxxxxx> > Cc: Kent Russell <kent.russell@xxxxxxx> > Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx> Reviewed-by: Mario Limonciello <mario.limonciello@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 -------- > 3 files changed, 1 insertion(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index bbac4239ceb3..35a0474ccdb0 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -186,7 +186,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; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 3b6b85d9e0be..051b9e231cf4 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -2364,7 +2364,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); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index e652ffb2c68e..03e928123d71 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -158,7 +158,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 */ > @@ -521,13 +520,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). > -- > 2.25.1
