From: Qiang Yu <yuq825@gmail.com>
To: Andrey Lebedev <andrey.lebedev@gmail.com>
Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>,
lima@lists.freedesktop.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
andrey@lebedev.lt
Subject: Re: [PATCH] drm/lima: Expose job_hang_limit module parameter
Date: Thu, 18 Jun 2020 14:43:53 +0800 [thread overview]
Message-ID: <CAKGbVbuV8meZji9PqFUwt4CpFEy6efpX63hJBgMY7fzAnZS4Rg@mail.gmail.com> (raw)
In-Reply-To: <20200617175447.2681047-1-andrey.lebedev@gmail.com>
On Thu, Jun 18, 2020 at 1:57 AM Andrey Lebedev <andrey.lebedev@gmail.com> 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>
> ---
>
> Hello,
>
> This patch allows to work around a freezing problem as discussed in
> https://gitlab.freedesktop.org/lima/linux/-/issues/33
>
> 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..2807eba26c55 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;
> +int lima_job_hang_limit;
Better be an "uint" to avoid negative check. With this fixed, patch is:
Reviewed-by: Qiang Yu <yuq825@gmail.com>
Regards,
Qiang
>
> 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, int, 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..39fd98e3b14d 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 int 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)
> --
> 2.25.1
>
next prev parent reply other threads:[~2020-06-18 6:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 17:54 [PATCH] drm/lima: Expose job_hang_limit module parameter Andrey Lebedev
2020-06-18 6:43 ` Qiang Yu [this message]
2020-06-18 6:56 ` Andrey Lebedev
2020-06-18 14:58 ` Andrey Lebedev
2020-06-19 2:03 ` Qiang Yu
2020-06-19 7:58 ` Andrey Lebedev
2020-07-06 16:17 ` Andrey Lebedev
2020-07-13 6:32 ` Qiang Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKGbVbuV8meZji9PqFUwt4CpFEy6efpX63hJBgMY7fzAnZS4Rg@mail.gmail.com \
--to=yuq825@gmail.com \
--cc=airlied@linux.ie \
--cc=andrey.lebedev@gmail.com \
--cc=andrey@lebedev.lt \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=lima@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).