From 8d11077da1cdfda2045f00f1e18ffe0777afe3e5 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 8 Sep 2009 11:51:46 +1000 Subject: [PATCH] --- yaml --- r: 163984 b: refs/heads/master c: 620f37811dcc9e0f97ee79fbf8908fcc097deaee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index db03476a5ffc..4f6b36c9dbb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ecff1eb0b83efa85be5b54c958e831e37f993f3 +refs/heads/master: 620f37811dcc9e0f97ee79fbf8908fcc097deaee diff --git a/trunk/drivers/gpu/drm/drm_crtc_helper.c b/trunk/drivers/gpu/drm/drm_crtc_helper.c index c9a50c729330..ff447f175a56 100644 --- a/trunk/drivers/gpu/drm/drm_crtc_helper.c +++ b/trunk/drivers/gpu/drm/drm_crtc_helper.c @@ -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))