projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3200de
)
drm/lima: fix lima_gem_wait() return value
author
Vasily Khoruzhick
<anarsoul@gmail.com>
Sun, 8 Sep 2019 02:48:00 +0000
(19:48 -0700)
committer
Qiang Yu
<yuq825@gmail.com>
Tue, 10 Sep 2019 02:09:00 +0000
(10:09 +0800)
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
Fixes: a1d2a6339961e ("drm/lima: driver for ARM Mali4xx GPUs")
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20190908024800.23229-1-anarsoul@gmail.com
drivers/gpu/drm/lima/lima_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/lima/lima_gem.c
b/drivers/gpu/drm/lima/lima_gem.c
index 477c0f766663de92dfd4bf263e7e374896eef73a..b609dc030d6ca906f61ffd8bba47dce8bf1e644d 100644
(file)
--- 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;