drm: prune modes when output is disconnected.
authorAdam Jackson <ajax@redhat.com>
Tue, 8 Sep 2009 01:51:46 +0000 (11:51 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 8 Sep 2009 01:51:46 +0000 (11:51 +1000)
When an output was disconnected, its mode list would remain.  If you later
plugged into a sink with no EDID (projector, etc), you'd inherit the mode
list from the old sink, which is not what you want.

taken from Fedora kernel

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_crtc_helper.c

index c9a50c729330c460d010628ca2f25544824b2ad8..ff447f175a565882e8cdfc0c687f719f46731221 100644 (file)
@@ -95,8 +95,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
        if (connector->status == connector_status_disconnected) {
                DRM_DEBUG_KMS("%s is disconnected\n",
                          drm_get_connector_name(connector));
-               /* TODO set EDID to NULL */
-               return 0;
+               goto prune;
        }
 
        count = (*connector_funcs->get_modes)(connector);
@@ -124,6 +123,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
                                                                   mode);
        }
 
+prune:
        drm_mode_prune_invalid(dev, &connector->modes, true);
 
        if (list_empty(&connector->modes))