Re: [git pull] drm-intel fixes since 2.6.35-rc4

[Jesse Barnes <jbarnes@virtuousgeek.org>]

Here you go.  Tested on the problem machine, works fine.

>From a9daaec5a40d572d11f689edac5cb1710c998b1e Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon, 26 Jul 2010 13:51:22 -0700
Subject: [PATCH] drm/i915: make sure we shut off the panel in eDP configs

Merge error from the last pull request.  Making sure we shut the panel
off is more correct and saves power.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_dp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5d42661..5dde80f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -798,7 +798,7 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)
 			intel_dp_link_down(intel_encoder, dp_priv->DP);
 			if (IS_eDP(intel_encoder)) {
 				ironlake_edp_backlight_off(dev);
-				ironlake_edp_backlight_off(dev);
+				ironlake_edp_panel_off(dev);
 			}
 		}
 	} else {
-- 
1.7.1