From 300a11617322e82e96da69317c8c8afa582d78ce Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 14 Jan 2010 15:54:23 +0100
Subject: [PATCH] --- yaml --- r: 179893 b: refs/heads/master c:
 b8780e2ad20feb8d086bc961a678e8fdb4fa296b h: refs/heads/master i:   179891:
 f4cdcdf51820dbdedc0e4a1ace3c160de0edab90 v: v3

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

diff --git a/[refs] b/[refs]
index d2d3e82389c8..2d34f7a234df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ed3165e55fdedee6fc04b757907a2d5ccacdf18
+refs/heads/master: b8780e2ad20feb8d086bc961a678e8fdb4fa296b
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
index 3dc7e09da286..8da35281a0c3 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -239,8 +239,12 @@ nouveau_connector_detect(struct drm_connector *connector)
 		return connector_status_connected;
 	}
 
-	kfree(nv_connector->edid);
-	nv_connector->edid = NULL;
+	/* Cleanup the previous EDID block. */
+	if (nv_connector->edid) {
+		drm_mode_connector_update_edid_property(connector, NULL);
+		kfree(nv_connector->edid);
+		nv_connector->edid = NULL;
+	}
 
 	i2c = nouveau_connector_ddc_detect(connector, &nv_encoder);
 	if (i2c) {