From e89caadb30db3b9504f1a0af086e27dfc424582c Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 3 Oct 2010 13:33:49 -0700
Subject: [PATCH] --- yaml --- r: 218142 b: refs/heads/master c:
 2c6be944111a873ce96865f1a6033056bdf0d0e2 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/intel_dp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 21ff549618d5..f40378191aad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35b62a89b0723ca05831f2edfff6deebe1806f21
+refs/heads/master: 2c6be944111a873ce96865f1a6033056bdf0d0e2
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
index 9e8fe122b0af..152d94507b79 100644
--- a/trunk/drivers/gpu/drm/i915/intel_dp.c
+++ b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -933,6 +933,7 @@ static void intel_dp_commit(struct drm_encoder *encoder)
 
 	if (IS_eDP(intel_dp) || IS_PCH_eDP(intel_dp))
 		ironlake_edp_backlight_on(dev);
+	intel_dp->dpms_mode = DRM_MODE_DPMS_ON;
 }
 
 static void