Skip to content

Commit de05133

Browse files
mlankhorstjnikula
authored andcommitted
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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reported-and-tested-by: Joseph Yasi <joe.yasi@gmail.com> Tested-by: Andreas Reis <andreas.reis@gmail.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: drm-intel-fixes@lists.freedesktop.org Fixes: 3c28ff2 ("i915: wait for fence in prepare_plane_fb") Link: http://patchwork.freedesktop.org/patch/msgid/5666EEC8.2000403@linux.intel.com (cherry picked from commit bcf8be2) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 2dc2f76 commit de05133

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

drivers/gpu/drm/i915/intel_display.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13765,13 +13765,15 @@ intel_prepare_plane_fb(struct drm_plane *plane,
1376513765

1376613766
/* For framebuffer backed by dmabuf, wait for fence */
1376713767
if (obj && obj->base.dma_buf) {
13768-
ret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv,
13769-
false, true,
13770-
MAX_SCHEDULE_TIMEOUT);
13771-
if (ret == -ERESTARTSYS)
13772-
return ret;
13768+
long lret;
13769+
13770+
lret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv,
13771+
false, true,
13772+
MAX_SCHEDULE_TIMEOUT);
13773+
if (lret == -ERESTARTSYS)
13774+
return lret;
1377313775

13774-
WARN_ON(ret < 0);
13776+
WARN(lret < 0, "waiting returns %li\n", lret);
1377513777
}
1377613778

1377713779
if (!obj) {

0 commit comments

Comments
 (0)