Reapply "drm/i915: Avoid stalling on pending flips for legacy cursor updates"

This reapplies commit acf4e84d6167317ff21be5c03e1ea76ea5783701.
With async unpin this should no longer break.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463490484-19540-20-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index daee426d4fc0b7947b0ad82413b452791d98754d..7bb1015c33d4b012796dcf1366948f3e38d2a292 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12928,12 +12928,14 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,
                struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
                struct intel_flip_work *work;
 
-               ret = intel_crtc_wait_for_pending_flips(crtc);
-               if (ret)
-                       return ret;
+               if (!state->legacy_cursor_update) {
+                       ret = intel_crtc_wait_for_pending_flips(crtc);
+                       if (ret)
+                               return ret;
 
-               if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
-                       flush_workqueue(dev_priv->wq);
+                       if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
+                               flush_workqueue(dev_priv->wq);
+               }
 
                /* test if we need to update something */
                if (!needs_work(crtc_state))