diff mbox

[4/8] drm/i915: Only wait for vblank after pipe enabling on gen2

Message ID 1300435330-15934-5-git-send-email-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Chris Wilson March 18, 2011, 8:02 a.m. UTC 
None
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2f63999..95f21d1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1618,7 +1618,9 @@  static void intel_disable_plane(struct drm_i915_private *dev_priv,
 
 	I915_WRITE(reg, val & ~DISPLAY_PLANE_ENABLE);
 	intel_flush_display_plane(dev_priv, plane);
-	intel_wait_for_vblank(dev_priv->dev, pipe);
+
+	if (dev_priv->info->gen == 2)
+		intel_wait_for_vblank(dev_priv->dev, pipe);
 }
 
 static void disable_pch_dp(struct drm_i915_private *dev_priv,