diff options
| author | Vasily Khoruzhick <anarsoul@gmail.com> | 2019-09-07 19:48:00 -0700 |
|---|---|---|
| committer | Qiang Yu <yuq825@gmail.com> | 2019-09-10 10:09:00 +0800 |
| commit | 21670bd78a25001cf8ef2679b378c73fb73b904f (patch) | |
| tree | 1cb86726896baf982ba912e29c313153d53681af | |
| parent | a3200debde5fda3e25f7e22cb2bc17a9280f7811 (diff) | |
drm/lima: fix lima_gem_wait() return valuedrm-misc-fixes-2019-09-12
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
| -rw-r--r-- | drivers/gpu/drm/lima/lima_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |