Attachment 35869 Details for Bug 28224 – patch fixing the issue on 2.6.33-2.6.34 (revert of earlier commit)

[patch] patch fixing the issue on 2.6.33-2.6.34 (revert of earlier commit)

intel-drm.patch (text/plain), 1.59 KB, created by josch on 2010-05-26 06:15:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: josch

Created: 2010-05-26 06:15:25 UTC

Size: 1.59 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 77e40cf..19df58c 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -126,15 +126,9 @@ intel_dp_link_clock(uint8_t link_bw)
> 
> /* I think this is a fiction */
> static int
>-intel_dp_link_required(struct drm_device *dev,
>-		       struct intel_encoder *intel_encoder, int pixel_clock)
>+intel_dp_link_required(int pixel_clock)
> {
>-	struct drm_i915_private *dev_priv = dev->dev_private;
>-
>-	if (IS_eDP(intel_encoder))
>-		return (pixel_clock * dev_priv->edp_bpp) / 8;
>-	else
>-		return pixel_clock * 3;
>+	return pixel_clock * 3;
> }
> 
> static int
>@@ -145,8 +139,7 @@ intel_dp_mode_valid(struct drm_connector *connector,
> 	int max_link_clock = intel_dp_link_clock(intel_dp_max_link_bw(intel_encoder));
> 	int max_lanes = intel_dp_max_lane_count(intel_encoder);
> 
>-	if (intel_dp_link_required(connector->dev, intel_encoder, mode->clock)
>-			> max_link_clock * max_lanes)
>+	if (intel_dp_link_required(mode->clock) > max_link_clock * max_lanes)
> 		return MODE_CLOCK_HIGH;
> 
> 	if (mode->clock < 10000)
>@@ -500,8 +493,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
> 		for (clock = 0; clock <= max_clock; clock++) {
> 			int link_avail = intel_dp_link_clock(bws[clock]) * lane_count;
> 
>-			if (intel_dp_link_required(encoder->dev, intel_encoder, mode->clock)
>-					<= link_avail) {
>+			if (intel_dp_link_required(mode->clock) <= link_avail) {
> 				dp_priv->link_bw = bws[clock];
> 				dp_priv->lane_count = lane_count;
> 				adjusted_mode->clock = intel_dp_link_clock(dp_priv->link_bw);

Actions: View | Splinter Review

Attachments on bug 28224: 35810 | 35811 | 35812 | 35867 | 35868 | 35869 | 35926 | 35927 | 36324 | 36325

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.