drm/i915: Flush the pending flips on the CRTC before modification
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 27 Sep 2012 20:25:58 +0000 (21:25 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 2 Oct 2012 09:50:26 +0000 (11:50 +0200)
commit5bb61643f6a70d48de9cfe91ad0fee0d618b6816
tree5fbdbef644e855410645a53802db9c555f976357
parentac82ea2e97a32f9c49d0746874b4cd1d8904d10f
drm/i915: Flush the pending flips on the CRTC before modification

This was meant to be the purpose of the
intel_crtc_wait_for_pending_flips() function which is called whilst
preparing the CRTC for a modeset or before disabling. However, as Ville
Syrjala pointed out, we set the pending flip notification on the old
framebuffer that is no longer attached to the CRTC by the time we come
to flush the pending operations. Instead, we can simply wait on the
pending unpin work to be finished on this CRTC, knowning that the
hardware has therefore finished modifying the registers, before proceeding
with our direct access.

Fixes i-g-t/flip_test on non-pch platforms. pch platforms simply
schedule the flip immediately when the pipe is disabled, leading
to other funny issues.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
[danvet: Added i-g-t note and cc: stable]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c