Commit de489844 authored by Andrey Lebedev's avatar Andrey Lebedev Committed by Qiang Yu
Browse files

drm/lima: Expose job_hang_limit module parameter 



Some pp or gp jobs can be successfully repeated even after they time outs.
Introduce lima module parameter to specify number of times a job can hang
before being dropped.

Signed-off-by: default avatarAndrey Lebedev <andrey@lebedev.lt>
Signed-off-by: default avatarQiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200619075900.3030696-1-andrey.lebedev@gmail.com
parent 06a28f90

drivers/gpu/drm/lima/lima_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
int lima_sched_timeout_ms;

uint lima_heap_init_nr_pages = 8;

uint lima_max_error_tasks;

uint lima_job_hang_limit;



MODULE_PARM_DESC(sched_timeout_ms, "task run timeout in ms");

module_param_named(sched_timeout_ms, lima_sched_timeout_ms, int, 0444);
@@ -29,6 +30,9 @@ module_param_named(heap_init_nr_pages, lima_heap_init_nr_pages, uint, 0444); 
MODULE_PARM_DESC(max_error_tasks, "max number of error tasks to save");

module_param_named(max_error_tasks, lima_max_error_tasks, uint, 0644);



MODULE_PARM_DESC(job_hang_limit, "number of times to allow a job to hang before dropping it (default 0)");

module_param_named(job_hang_limit, lima_job_hang_limit, uint, 0444);



static int lima_ioctl_get_param(struct drm_device *dev, void *data, struct drm_file *file)

{

	struct drm_lima_get_param *args = data;

drivers/gpu/drm/lima/lima_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
extern int lima_sched_timeout_ms;

extern uint lima_heap_init_nr_pages;

extern uint lima_max_error_tasks;

extern uint lima_job_hang_limit;



struct lima_vm;

struct lima_bo;

drivers/gpu/drm/lima/lima_sched.c

+3 −2
Original line number Diff line number Diff line
@@ -503,8 +503,9 @@ int lima_sched_pipe_init(struct lima_sched_pipe *pipe, const char *name) 


	INIT_WORK(&pipe->recover_work, lima_sched_recover_work);



	return drm_sched_init(&pipe->base, &lima_sched_ops, 1, 0,

			      msecs_to_jiffies(timeout), name);

	return drm_sched_init(&pipe->base, &lima_sched_ops, 1,

			      lima_job_hang_limit, msecs_to_jiffies(timeout),

			      name);

}



void lima_sched_pipe_fini(struct lima_sched_pipe *pipe)