From 7e11cd9526a147e13e59ef1952764fe4f6131f9c Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 6 Jul 2010 11:27:52 +1000
Subject: [PATCH] --- yaml --- r: 205065 b: refs/heads/master c:
 646bef2d20accc6ed696a98e38d5f2515b0ff35d h: refs/heads/master i:   205063:
 81f1f9a8b627919273084eaf44170077ef792670 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 567ead2f2250..03b08394e8f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f403d9cca359531e16bc685ed5d619c77762004
+refs/heads/master: 646bef2d20accc6ed696a98e38d5f2515b0ff35d
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
index 464b3dca94a4..c2fb15311b96 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -623,7 +623,8 @@ nouveau_connector_get_modes(struct drm_connector *connector)
 		ret = get_slave_funcs(nv_encoder)->
 			get_modes(to_drm_encoder(nv_encoder), connector);
 
-	if (nv_encoder->dcb->type == OUTPUT_LVDS)
+	if (nv_connector->dcb->type == DCB_CONNECTOR_LVDS ||
+	    nv_connector->dcb->type == DCB_CONNECTOR_eDP)
 		ret += nouveau_connector_scaler_modes_add(connector);
 
 	return ret;