---

yaml --- r: 269792 b: refs/heads/master c: bee7eb2 h: refs/heads/master v: v3
git-mirror · Sep 30, 2011 · 51e46e8 · 51e46e8
1 parent 06e1c5a
commit 51e46e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97af61f57e03a39afa309d1c8a0d8fb9331e2f89
+refs/heads/master: bee7eb2da2fb50ccf76cb7596d20e90d28de040c
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -1088,7 +1088,8 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)
 			ironlake_edp_panel_on(intel_dp);
 			ironlake_edp_panel_vdd_off(intel_dp);
 			intel_dp_complete_link_train(intel_dp);
-		}
+		} else
+			ironlake_edp_panel_vdd_off(intel_dp);
 		if (is_edp(intel_dp))
 			ironlake_edp_backlight_on(dev);
 	}