[2/2] drm/i915: Attempt to fix watermark setup on 85x

Commit Message

Adam Jackson April 15, 2010, 6:03 p.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9fdea06..cd87e3b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5263,11 +5263,12 @@  static void intel_init_display(struct drm_device *dev)
 		dev_priv->display.update_wm = i965_update_wm;
 	else if (IS_I9XX(dev) || IS_MOBILE(dev)) {
 		dev_priv->display.update_wm = i9xx_update_wm;
-		dev_priv->display.get_fifo_size = i9xx_get_fifo_size;
-	} else {
 		if (IS_I85X(dev))
 			dev_priv->display.get_fifo_size = i85x_get_fifo_size;
-		else if (IS_845G(dev))
+		else
+			dev_priv->display.get_fifo_size = i9xx_get_fifo_size;
+	} else {
+		if (IS_845G(dev))
 			dev_priv->display.get_fifo_size = i845_get_fifo_size;
 		else
 			dev_priv->display.get_fifo_size = i830_get_fifo_size;