Oh, I was miss leading by the drm_gem_reservation_object_wait comments. Patch is: Reviewed-by: Qiang Yu <yuq825@xxxxxxxxx> 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? Thanks, Qiang On Sun, Sep 8, 2019 at 10:48 AM Vasily Khoruzhick <anarsoul@xxxxxxxxx> 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@xxxxxxxxxxxxxxx > Signed-off-by: Vasily Khoruzhick <anarsoul@xxxxxxxxx> > --- > 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 >
