From bb5c9adabe3915703a7858b58c213780b644b936 Mon Sep 17 00:00:00 2001
From: Albert Damen <albrt@gmx.net>
Date: Sun, 20 Jun 2010 16:57:57 +0200
Subject: [PATCH] --- yaml --- r: 205046 b: refs/heads/master c:
 3195c5f9784aa8ec27a7bb19a6840dc67e9e90f1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fff85839e295..8ad776fd6163 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3af76454a70cd09d8e3ede94ee50a35c772ba439
+refs/heads/master: 3195c5f9784aa8ec27a7bb19a6840dc67e9e90f1
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
index 79190206b398..53700f8cd499 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -365,6 +365,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector)
 #endif
 
 	drm_mode_connector_update_edid_property(connector, nv_connector->edid);
+	nouveau_connector_set_encoder(connector, nv_encoder);
 	return status;
 }