]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Widen return value for reservation_object_wait_timeout_rcu to long.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 8 Dec 2015 14:52:56 +0000 (15:52 +0100)
committerJani Nikula <jani.nikula@intel.com>
Wed, 13 Jan 2016 08:50:11 +0000 (10:50 +0200)
commit033f2c5e93e9829104dc8fc8a8e25b896107002b
treea5a144119995b8e830b3c181dd820a6841de0002
parent27eef80f70172cb5545d9c1a580048a00370810c
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: eb757b18290d73 ("i915: wait for fence in prepare_plane_fb")
Link: http://patchwork.freedesktop.org/patch/msgid/5666EEC8.2000403@linux.intel.com
(cherry picked from commit bcf8be279c79df6a8a17d9c3e1f9bc926444a87c)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c