diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-01-14 15:54:23 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-01-14 15:58:53 +0100 |
| commit | d0bc945c5821ea4b4fb8ee79b68b3f7ae2f7ee7c (patch) | |
| tree | 041da9ad0f16e3b22437a5165ffcd71a2b7e72c1 /drivers | |
| parent | 7394b761e7725978843aee09020aa9eadf447ee5 (diff) | |
drm/nouveau: Unset the EDID connector property when the EDID block goes away.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 3dc7e09da286..8da35281a0c3 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) { |