From c3118be48ef811b46f587d77aa9c2517d6dbab9b Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 2 Sep 2010 17:59:39 +0100 Subject: [PATCH] --- yaml --- r: 217897 b: refs/heads/master c: 2bbda389632dd810d80c055fc1ec90827a16f687 h: refs/heads/master i: 217895: b4ca7b105ef1c0f871d48b0c32626c5b3845bbae v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3982869a373a..e82c41341e70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 425904dd8a86d9ca3a3be38eaaa12b4844dceed6 +refs/heads/master: 2bbda389632dd810d80c055fc1ec90827a16f687 diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c index 3afd6e5662d1..e797157f4bb9 100644 --- a/trunk/drivers/gpu/drm/i915/i915_irq.c +++ b/trunk/drivers/gpu/drm/i915/i915_irq.c @@ -351,12 +351,12 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev) if (de_iir & DE_PLANEA_FLIP_DONE) { intel_prepare_page_flip(dev, 0); - intel_finish_page_flip(dev, 0); + intel_finish_page_flip_plane(dev, 0); } if (de_iir & DE_PLANEB_FLIP_DONE) { intel_prepare_page_flip(dev, 1); - intel_finish_page_flip(dev, 1); + intel_finish_page_flip_plane(dev, 1); } if (de_iir & DE_PIPEA_VBLANK)