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

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 3dc7e09da286431432aa9993ee0bfe585514b85d..8da35281a0c3b132513e9022b5558b1f3bd60a01 100644 (file)
--- 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) {