From: Francisco Jerez Date: Thu, 14 Jan 2010 14:54:23 +0000 (+0100) Subject: drm/nouveau: Unset the EDID connector property when the EDID block goes away. X-Git-Tag: v2.6.33-rc6~27^2~11^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8780e2ad20feb8d086bc961a678e8fdb4fa296b;p=platform%2Fupstream%2Fkernel-adaptation-pc.git drm/nouveau: Unset the EDID connector property when the EDID block goes away. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 3dc7e09..8da3528 100644 --- 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) {