diff options
| author | Tony Lindgren <[email protected]> | 2019-09-23 10:38:20 -0700 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2019-09-23 10:38:20 -0700 |
| commit | c01f5120ca7cf2994336c42b8a9cae697121ffb3 (patch) | |
| tree | d0ac4ed8e3bc4c11203f31b984d300b0f4127978 /drivers/gpu/drm/lima/lima_gem.c | |
| parent | a4c8723a162e6244fb01944fbf446750575dba59 (diff) | |
| parent | f1f028ff89cb0d37db299d48e7b2ce19be040d52 (diff) | |
Merge branch 'fixes-merge-window-pt2' into fixes
Diffstat (limited to 'drivers/gpu/drm/lima/lima_gem.c')
| -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; |