From: "Heiko Stübner" <heiko@sntech.de>
To: lima@lists.freedesktop.org
Cc: Qiang Yu <yuq825@gmail.com>,
Vasily Khoruzhick <anarsoul@gmail.com>,
David Airlie <airlied@linux.ie>,
stable@vger.kernel.org,
dri-devel <dri-devel@lists.freedesktop.org>,
Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [Lima] [PATCH] drm/lima: fix lima_gem_wait() return value
Date: Mon, 09 Sep 2019 14:18:40 +0200 [thread overview]
Message-ID: <3263343.nbYvo8rMJO@diego> (raw)
In-Reply-To: <CAKGbVbt056DyZHer1bKnAv8uBCX6zbsWeMjE6AQy8HYQf7L1wg@mail.gmail.com>
Hi Qiang,
Am Montag, 9. September 2019, 04:30:43 CEST schrieb Qiang Yu:
> Oh, I was miss leading by the drm_gem_reservation_object_wait
> comments. Patch is:
> Reviewed-by: Qiang Yu <yuq825@gmail.com>
>
> I'll apply this patch to drm-misc-next.
>
> Current kernel release is 5.3-rc8, is it too late for this fix to go
> into the mainline 5.3 release?
> I'd like to know how to apply this fix for current rc kernels, by
> drm-misc-fixes? Can I push
> to drm-misc-fixes by dim or I can only push to drm-misc-next and
> drm-misc maintainer will
> pick fixes from it to drm-misc-fixes?
drm-misc-fixes gets merged into drm-misc-next by maintainers regularly,
so I _think_ you should apply the fix-patch to drm-misc-fixes first.
[I also always have to read the documentation ;-) ]
In any case you might want to add a "Fixes: ....." tag as well as a
"Cc: stable@vger.kernel.org" tag, so it can be backported to stable
kernels if applicable.
Heiko
> On Sun, Sep 8, 2019 at 10:48 AM Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> >
> > drm_gem_reservation_object_wait() returns 0 if it succeeds and -ETIME
> > if it timeouts, but lima driver assumed that 0 is error.
> >
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> > ---
> > drivers/gpu/drm/lima/lima_gem.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
> > index 477c0f766663..b609dc030d6c 100644
> > --- a/drivers/gpu/drm/lima/lima_gem.c
> > +++ b/drivers/gpu/drm/lima/lima_gem.c
> > @@ -342,7 +342,7 @@ int lima_gem_wait(struct drm_file *file, u32 handle, u32 op, s64 timeout_ns)
> > timeout = drm_timeout_abs_to_jiffies(timeout_ns);
> >
> > ret = drm_gem_reservation_object_wait(file, handle, write, timeout);
> > - if (ret == 0)
> > + if (ret == -ETIME)
> > ret = timeout ? -ETIMEDOUT : -EBUSY;
> >
> > return ret;
> > --
> > 2.23.0
> >
> _______________________________________________
> lima mailing list
> lima@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/lima
next prev parent reply other threads:[~2019-09-09 12:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-08 2:48 [PATCH] drm/lima: fix lima_gem_wait() return value Vasily Khoruzhick
2019-09-09 2:30 ` Qiang Yu
2019-09-09 12:18 ` Heiko Stübner [this message]
2019-09-09 16:23 ` [Lima] " Vasily Khoruzhick
2019-09-10 1:16 ` Qiang Yu
2019-09-10 3:09 ` 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=3263343.nbYvo8rMJO@diego \
--to=heiko@sntech.de \
--cc=airlied@linux.ie \
--cc=anarsoul@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=lima@lists.freedesktop.org \
--cc=stable@vger.kernel.org \
--cc=yuq825@gmail.com \
/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).