[Bug 82612] [IVB] [drm:intel_pipe_set_base] *ERROR* pipe is still busy with an old pageflip (kernel 3.16.0)

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=82612

Jani Nikula <jani.nikula at intel.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |NEEDINFO

--- Comment #2 from Jani Nikula <jani.nikula at intel.com> ---
Does this patch from Chris help? 

diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index d8324c69fa86..84dfdfe79896 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3351,18 +3351,17 @@ void intel_crtc_wait_for_pending_flips(struct drm_crtc
*crtc)
     struct drm_device *dev = crtc->dev;
     struct drm_i915_private *dev_priv = dev->dev_private;

-    if (crtc->primary->fb == NULL)
-        return;
-
     WARN_ON(waitqueue_active(&dev_priv->pending_flip_queue));

     WARN_ON(wait_event_timeout(dev_priv->pending_flip_queue,
                    !intel_crtc_has_pending_flip(crtc),
                    60*HZ) == 0);

-    mutex_lock(&dev->struct_mutex);
-    intel_finish_fb(crtc->primary->fb);
-    mutex_unlock(&dev->struct_mutex);
+    if (crtc->primary->fb) {
+        mutex_lock(&dev->struct_mutex);
+        intel_finish_fb(crtc->primary->fb);
+        mutex_unlock(&dev->struct_mutex);
+    }
 }

 /* Program iCLKIP clock to the desired frequency */

http://mid.gmane.org/1408536814-12974-1-git-send-email-chris@chris-wilson.co.uk

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20140826/0ec306bc/attachment-0001.html>