Commit 70565d00 authored Jul 01, 2010 by Jesse Barnes Committed by Linus Torvalds Jul 01, 2010

drm/i915: fix page flip finish vs. prepare on plane B



The refreshed patch had a copy & paste bug.

Reported-by: Simon Farnsworth <simon.farnsworth@onelan.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent dd1ea37d

drivers/gpu/drm/i915/i915_irq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -947,9 +947,9 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
		}

		if (iir & I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT) {
		intel_prepare_page_flip(dev, 1);
		if (dev_priv->flip_pending_is_done)
		intel_finish_page_flip_plane(dev, 1);
		intel_prepare_page_flip(dev, 1);
		}

		if (pipea_stats & vblank_status) {