---

yaml --- r: 218005 b: refs/heads/master c: c9f9ccc h: refs/heads/master i: 218003: 1b779af v: v3
git-mirror · Sep 12, 2010 · 67214c8 · 67214c8
1 parent 2c60210
commit 67214c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77d07fd9d73ef28689737c0952dbd5d6a5017743
+refs/heads/master: c9f9ccc150e119bab6a1003e7762b024623011d8
diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c
@@ -84,17 +84,13 @@ static void intel_lvds_set_power(struct drm_device *dev, bool on)
 	if (on) {
 		I915_WRITE(lvds_reg, I915_READ(lvds_reg) | LVDS_PORT_EN);
 		I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON);
-		if (wait_for(I915_READ(status_reg) & PP_ON, 1000))
-			DRM_ERROR("timed out waiting to enable LVDS pipe");
-
 		intel_panel_set_backlight(dev, dev_priv->backlight_level);
 	} else {
 		intel_panel_set_backlight(dev, 0);
-
 		I915_WRITE(ctl_reg, I915_READ(ctl_reg) & ~POWER_TARGET_ON);
 		I915_WRITE(lvds_reg, I915_READ(lvds_reg) & ~LVDS_PORT_EN);
-		POSTING_READ(lvds_reg);
 	}
+	POSTING_READ(lvds_reg);
 }
 
 static void intel_lvds_dpms(struct drm_encoder *encoder, int mode)