Commit de051336 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula

drm/i915: Widen return value for reservation_object_wait_timeout_rcu to long.

This fixes a spurious warning from an integer overflow on 64-bits systems.
The function may return MAX_SCHEDULE_TIMEOUT which gets truncated to -1.

Explicitly handling this by casting to lret fixes it.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reported-and-tested-by: default avatarJoseph Yasi <joe.yasi@gmail.com>
Tested-by: default avatarAndreas Reis <andreas.reis@gmail.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: drm-intel-fixes@lists.freedesktop.org
Fixes: 3c28ff22 ("i915: wait for fence in prepare_plane_fb")
Link: http://patchwork.freedesktop.org/patch/msgid/5666EEC8.2000403@linux.intel.com
(cherry picked from commit bcf8be27)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 2dc2f761
...@@ -13765,13 +13765,15 @@ intel_prepare_plane_fb(struct drm_plane *plane, ...@@ -13765,13 +13765,15 @@ intel_prepare_plane_fb(struct drm_plane *plane,
/* For framebuffer backed by dmabuf, wait for fence */ /* For framebuffer backed by dmabuf, wait for fence */
if (obj && obj->base.dma_buf) { if (obj && obj->base.dma_buf) {
ret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv, long lret;
false, true,
MAX_SCHEDULE_TIMEOUT); lret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv,
if (ret == -ERESTARTSYS) false, true,
return ret; MAX_SCHEDULE_TIMEOUT);
if (lret == -ERESTARTSYS)
return lret;
WARN_ON(ret < 0); WARN(lret < 0, "waiting returns %li\n", lret);
} }
if (!obj) { if (!obj) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment