| From 5f0a26128d66ef81613fe923d5c288942844ccdc Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Fri, 7 Oct 2011 14:23:47 -0400 |
| Subject: drm/radeon/kms: bail early in dvi_detect for digital only connectors |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit 5f0a26128d66ef81613fe923d5c288942844ccdc upstream. |
| |
| DVI-D and HDMI-A are digital only, so there's no need to |
| attempt analog load detect. Also, skip bail before the |
| !force check, or we fail to get a disconnect events. |
| The next patches in the series attempt to fix disconnect |
| events for connectors with analog support (DVI-I, HDMI-B, |
| DVI-A). |
| |
| Fixes: |
| https://bugs.freedesktop.org/show_bug.cgi?id=41561 |
| |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_connectors.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_connectors.c |
| +++ b/drivers/gpu/drm/radeon/radeon_connectors.c |
| @@ -959,6 +959,11 @@ radeon_dvi_detect(struct drm_connector * |
| if ((ret == connector_status_connected) && (radeon_connector->use_digital == true)) |
| goto out; |
| |
| + /* DVI-D and HDMI-A are digital only */ |
| + if ((connector->connector_type == DRM_MODE_CONNECTOR_DVID) || |
| + (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)) |
| + goto out; |
| + |
| if (!force) { |
| ret = connector->status; |
| goto out; |
