diff options
| author | Jesse Barnes <jbarnes@jbarnes-acer.localdomain> | 2010-07-01 04:45:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 18:47:12 -0700 |
| commit | 70565d00db6ef5735819db973fa8da95bd34a6ab (patch) | |
| tree | 5249f6aed139b46986c040831db3676f4024e648 /drivers/gpu | |
| parent | dd1ea37d9257bdf118693235dc74003901c55204 (diff) | |
| download | linux-stable-70565d00db6ef5735819db973fa8da95bd34a6ab.tar.gz linux-stable-70565d00db6ef5735819db973fa8da95bd34a6ab.tar.bz2 linux-stable-70565d00db6ef5735819db973fa8da95bd34a6ab.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index d676e55eb212..dba53d4b9fb3 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -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) { |