Merge tag 'drm-intel-next-fixes-2016-01-14' of git://anongit.freedesktop.org/drm...

[linux.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ceaea7a3641a2aa2eb61bb5ee9a2cc639559e6b3..580d094bfc1e1fc7426a937b721b29062ac9fe8e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13763,13 +13763,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,
-                                                         false, true,
-                                                         MAX_SCHEDULE_TIMEOUT);
-               if (ret == -ERESTARTSYS)
-                       return ret;
+               long lret;
+
+               lret = reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv,
+                                                          false, true,
+                                                          MAX_SCHEDULE_TIMEOUT);
+               if (lret == -ERESTARTSYS)
+                       return lret;
 
-               WARN_ON(ret < 0);
+               WARN(lret < 0, "waiting returns %li\n", lret);
        }
 
        if (!obj) {