Attachment 60765 Details for Bug 42490 – possible fix

[patch] possible fix

bug42490.diff (text/plain), 1.93 KB, created by Alex Deucher on 2012-04-29 05:30:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2012-04-29 05:30:24 UTC

Size: 1.93 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
>index e607c4d..b6933a5 100644
>--- a/drivers/gpu/drm/radeon/atombios_encoders.c
>+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
>@@ -747,8 +747,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
> 		hpd_id = radeon_connector->hpd.hpd;
> 		dp_clock = dig_connector->dp_clock;
> 		dp_lane_count = dig_connector->dp_lane_count;
>-		connector_object_id =
>-			(radeon_connector->connector_object_id & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
>+		connector_object_id = radeon_connector->connector_object_id;
> 		igp_lane_info = dig_connector->igp_lane_info;
> 	}
> 
>@@ -1157,8 +1156,7 @@ atombios_external_encoder_setup(struct drm_encoder *encoder,
> 
> 		dp_clock = dig_connector->dp_clock;
> 		dp_lane_count = dig_connector->dp_lane_count;
>-		connector_object_id =
>-			(radeon_connector->connector_object_id & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
>+		connector_object_id = radeon_connector->connector_object_id;
> 		/* bpc = connector->display_info.bpc; */
> 	}
> 
>@@ -1607,17 +1605,7 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
> 			break;
> 		case 2:
> 			args.v2.ucCRTC = radeon_crtc->crtc_id;
>-			if (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE) {
>-				struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
>-
>-				if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
>-					args.v2.ucEncodeMode = ATOM_ENCODER_MODE_LVDS;
>-				else if (connector->connector_type == DRM_MODE_CONNECTOR_VGA)
>-					args.v2.ucEncodeMode = ATOM_ENCODER_MODE_CRT;
>-				else
>-					args.v2.ucEncodeMode = atombios_get_encoder_mode(encoder);
>-			} else
>-				args.v2.ucEncodeMode = atombios_get_encoder_mode(encoder);
>+			args.v2.ucEncodeMode = atombios_get_encoder_mode(encoder);
> 			switch (radeon_encoder->encoder_id) {
> 			case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
> 			case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

Actions: View | Splinter Review

Attachments on bug 42490: 53026 | 53027 | 60707 | 60730 | 60758 | 60760 | 60765 | 60773 | 60774 | 66808 | 66817 | 66819 | 66822 | 66828

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.