drm/i915: Widen return value for reservation_object_wait_timeout_rcu to long.
Subsystems (2)
PATCH 1/1 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.
---
drivers/gpu/drm/i915/intel_display.c +6 -4
@@ -13686,13 +13686,15 @@ intel_prepare_plane_fb(struct drm_plane *plane,/* For framebuffer backed by dmabuf, wait for fence */ if (obj && obj->base.dma_buf) { - ret =reservation_object_wait_timeout_rcu (obj->base.dma_buf->resv, +long lret; + + lret =reservation_object_wait_timeout_rcu (obj->base.dma_buf->resv, false, true,MAX_SCHEDULE_TIMEOUT ); -if (ret == -ERESTARTSYS ) -return ret; +if (lret == -ERESTARTSYS ) +return lret; -WARN_ON (ret <0 ); +WARN (lret <0 ,"waiting returns %li\n" , lret); }if (!obj) {
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Maarten Lankhorst
This fixes a spurious warning from an integer overflow on 64-bits systems. The function may return
MAX_SCHEDULE_TIMEOUTwhich gets truncated to -1.Explicitly handling this by casting to lret fixes it.
Signed-off-by Maarten Lankhorst <[email protected]>Reported-and-tested-by Joseph Yasi <[email protected]>
Quoted 30 lines
---
drivers/gpu/drm/i915/intel_display.c +6
-4@@ -13686,13 +13686,15 @@ intel_prepare_plane_fb(struct drm_plane *plane,/* For framebuffer backed by dmabuf, wait for fence */ if (obj && obj->base.dma_buf) { - ret =reservation_object_wait_timeout_rcu (obj->base.dma_buf->resv, +long lret; + + lret =reservation_object_wait_timeout_rcu (obj->base.dma_buf->resv, false, true,MAX_SCHEDULE_TIMEOUT ); -if (ret == -ERESTARTSYS ) -return ret; +if (lret == -ERESTARTSYS ) +return lret; -WARN_ON (ret <0 ); +WARN (lret <0 ,"waiting returns %li\n" , lret); }if (!obj) {_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx