Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] drm/lima: Expose job_hang_limit module parameter
To:     Qiang Yu <yuq825@gmail.com>, David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        dri-devel@lists.freedesktop.org, lima@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Cc:     andrey@lebedev.lt
References: <CAKGbVbtYusvURFcUyQtgUycNJPAQyDGDaLXW8qw-x49DqfKmQA@mail.gmail.com>
 <20200619075900.3030696-1-andrey.lebedev@gmail.com>
From:   Andrey Lebedev <andrey.lebedev@gmail.com>
Message-ID: <bd4370f5-6fb4-d32f-5ca4-02e56526f47d@gmail.com>
Date:   Mon, 6 Jul 2020 19:17:09 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.8.0
MIME-Version: 1.0
In-Reply-To: <20200619075900.3030696-1-andrey.lebedev@gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hello guys,

What is the status of this patch? Was this committed to any branch? Is 
it pending for merge to the mainline? Do I have to do anything in order 
to make it mergeable?

On 6/19/20 10:58 AM, Andrey Lebedev wrote:
> From: Andrey Lebedev <andrey@lebedev.lt>
> 
> 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: Andrey Lebedev <andrey@lebedev.lt>
> ---
> 
> Now all types are correct (uint).
> 
>   drivers/gpu/drm/lima/lima_drv.c   | 4 ++++
>   drivers/gpu/drm/lima/lima_drv.h   | 1 +
>   drivers/gpu/drm/lima/lima_sched.c | 5 +++--
>   3 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c
> index a831565af813..ab460121fd52 100644
> --- a/drivers/gpu/drm/lima/lima_drv.c
> +++ b/drivers/gpu/drm/lima/lima_drv.c
> @@ -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;
> diff --git a/drivers/gpu/drm/lima/lima_drv.h b/drivers/gpu/drm/lima/lima_drv.h
> index fdbd4077c768..c738d288547b 100644
> --- a/drivers/gpu/drm/lima/lima_drv.h
> +++ b/drivers/gpu/drm/lima/lima_drv.h
> @@ -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;
> diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c
> index e6cefda00279..1602985dfa04 100644
> --- a/drivers/gpu/drm/lima/lima_sched.c
> +++ b/drivers/gpu/drm/lima/lima_sched.c
> @@ -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)
> 

-- 
Andrey Lebedev aka -.- . -.. -.. . .-.
Software engineer
Homepage: http://lebedev.lt/