drm/nouveau: Unset the EDID connector property when the EDID block go…

…es away. Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
git-mirror · Jan 14, 2010 · b8780e2 · b8780e2
1 parent 0ed3165
commit b8780e2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/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) {