lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nouveau: Unset the EDID connector property when the EDID block goes away.

Browse Source 
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Francisco Jerez
2010-01-14 15:54:23 +01:00
committed by Ben Skeggs
parent 0ed3165e55
commit b8780e2ad2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/nouveau/nouveau_connector.c
View File

@@ -239,8 +239,12 @@ nouveau_connector_detect(struct drm_connector *connector)
return connector_status_connected; return connector_status_connected;
} }
kfree(nv_connector->edid); /* Cleanup the previous EDID block. */
nv_connector->edid = NULL; 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); i2c = nouveau_connector_ddc_detect(connector, &nv_encoder);
if (i2c) { if (i2c) {