---

yaml --- r: 218004 b: refs/heads/master c: 77d07fd h: refs/heads/master v: v3
git-mirror · Sep 12, 2010 · 2c60210 · 2c60210
1 parent 1b779af
commit 2c60210
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b222f2673354c65e178cbcba610e7883a05f5bf3
+refs/heads/master: 77d07fd9d73ef28689737c0952dbd5d6a5017743
diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c
@@ -83,22 +83,15 @@ 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);
-		POSTING_READ(lvds_reg);
-
-		I915_WRITE(ctl_reg, I915_READ(ctl_reg) |
-			   POWER_TARGET_ON);
+		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);
-		if (wait_for((I915_READ(status_reg) & PP_ON) == 0, 1000))
-			DRM_ERROR("timed out waiting for LVDS pipe to turn off");
-
+		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);
 	}