Attachment 40237 Details for Bug 27731 – force dvi mode

[patch] force dvi mode

bug27731.diff (text/plain), 1.88 KB, created by Alex Deucher on 2010-11-12 08:02:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-11-12 08:02:42 UTC

Size: 1.88 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
>index e40d08f..9ddfaf5 100644
>--- a/drivers/gpu/drm/radeon/radeon_encoders.c
>+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
>@@ -614,8 +614,6 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)
> int
> atombios_get_encoder_mode(struct drm_encoder *encoder)
> {
>-	struct drm_device *dev = encoder->dev;
>-	struct radeon_device *rdev = dev->dev_private;
> 	struct drm_connector *connector;
> 	struct radeon_connector *radeon_connector;
> 	struct radeon_connector_atom_dig *dig_connector;
>@@ -630,11 +628,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
> 	case DRM_MODE_CONNECTOR_DVII:
> 	case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
> 		if (drm_detect_hdmi_monitor(radeon_connector->edid)) {
>-			/* fix me */
>-			if (ASIC_IS_DCE4(rdev))
>-				return ATOM_ENCODER_MODE_DVI;
>-			else
>-				return ATOM_ENCODER_MODE_HDMI;
>+			return ATOM_ENCODER_MODE_DVI;
> 		} else if (radeon_connector->use_digital)
> 			return ATOM_ENCODER_MODE_DVI;
> 		else
>@@ -644,11 +638,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
> 	case DRM_MODE_CONNECTOR_HDMIA:
> 	default:
> 		if (drm_detect_hdmi_monitor(radeon_connector->edid)) {
>-			/* fix me */
>-			if (ASIC_IS_DCE4(rdev))
>-				return ATOM_ENCODER_MODE_DVI;
>-			else
>-				return ATOM_ENCODER_MODE_HDMI;
>+			return ATOM_ENCODER_MODE_DVI;
> 		} else
> 			return ATOM_ENCODER_MODE_DVI;
> 		break;
>@@ -662,11 +652,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
> 		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
> 			return ATOM_ENCODER_MODE_DP;
> 		else if (drm_detect_hdmi_monitor(radeon_connector->edid)) {
>-			/* fix me */
>-			if (ASIC_IS_DCE4(rdev))
>-				return ATOM_ENCODER_MODE_DVI;
>-			else
>-				return ATOM_ENCODER_MODE_HDMI;
>+			return ATOM_ENCODER_MODE_DVI;
> 		} else
> 			return ATOM_ENCODER_MODE_DVI;
> 		break;

Actions: View | Splinter Review

Attachments on bug 27731: 35153 | 35154 | 35155 | 40237 | 40274 | 42421

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.