diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-02 12:59:39 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 05:13:34 -0400 |
commit | 2bbda389632dd810d80c055fc1ec90827a16f687 (patch) | |
tree | 47ce7265f834ffcc7a8219edde1a6cba726c6b1d /drivers/gpu/drm/i915/i915_irq.c | |
parent | 425904dd8a86d9ca3a3be38eaaa12b4844dceed6 (diff) |
drm/i915: Ironlake page-flipping is per-plane not per-pipe
Fix a minor confusion between intel_page_flip_finish(pipe) and
intel_page_flip_finish_plane(plane) -- should have no effect as
currently we map pipe 0 to plane 0 (and pipe 1 to plane 1).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 3afd6e5662d1..e797157f4bb9 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -351,12 +351,12 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev) | |||
351 | 351 | ||
352 | if (de_iir & DE_PLANEA_FLIP_DONE) { | 352 | if (de_iir & DE_PLANEA_FLIP_DONE) { |
353 | intel_prepare_page_flip(dev, 0); | 353 | intel_prepare_page_flip(dev, 0); |
354 | intel_finish_page_flip(dev, 0); | 354 | intel_finish_page_flip_plane(dev, 0); |
355 | } | 355 | } |
356 | 356 | ||
357 | if (de_iir & DE_PLANEB_FLIP_DONE) { | 357 | if (de_iir & DE_PLANEB_FLIP_DONE) { |
358 | intel_prepare_page_flip(dev, 1); | 358 | intel_prepare_page_flip(dev, 1); |
359 | intel_finish_page_flip(dev, 1); | 359 | intel_finish_page_flip_plane(dev, 1); |
360 | } | 360 | } |
361 | 361 | ||
362 | if (de_iir & DE_PIPEA_VBLANK) | 362 | if (de_iir & DE_PIPEA_VBLANK) |