From: Eric Anholt <eric@anholt.net>
Date: Mon, 2 Aug 2010 02:23:53 +0000 (-0700)
Subject: Merge remote branch 'origin/master' into drm-intel-next
X-Git-Tag: v2.6.36-rc1~540^2~11^2~25
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2bd34f6ca86b5a5f9b749624f73310820e7a93fd;p=~shefty%2Frdma-dev.git

Merge remote branch 'origin/master' into drm-intel-next

This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c
---

2bd34f6ca86b5a5f9b749624f73310820e7a93fd
diff --cc drivers/gpu/drm/i915/intel_display.c
index 8359c50e664,5e21b311982..30d89111f55
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2419,11 -2373,9 +2439,9 @@@ static bool intel_crtc_mode_fixup(struc
  	struct drm_device *dev = crtc->dev;
  	if (HAS_PCH_SPLIT(dev)) {
  		/* FDI link clock is fixed at 2.7G */
 -		if (mode->clock * 3 > 27000 * 4)
 -			return MODE_CLOCK_HIGH;
 +		if (mode->clock * 3 > IRONLAKE_FDI_FREQ * 4)
 +			return false;
  	}
- 
- 	drm_mode_set_crtcinfo(adjusted_mode, 0);
  	return true;
  }
  
diff --cc drivers/gpu/drm/i915/intel_dp.c
index b4f02826676,5dde80f9e65..c612981e619
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -778,14 -796,18 +823,18 @@@ intel_dp_dpms(struct drm_encoder *encod
  	if (mode != DRM_MODE_DPMS_ON) {
  		if (dp_reg & DP_PORT_EN) {
  			intel_dp_link_down(intel_encoder, dp_priv->DP);
- 			if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv))
 -			if (IS_eDP(intel_encoder)) {
++			if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
  				ironlake_edp_backlight_off(dev);
+ 				ironlake_edp_panel_off(dev);
+ 			}
  		}
  	} else {
  		if (!(dp_reg & DP_PORT_EN)) {
  			intel_dp_link_train(intel_encoder, dp_priv->DP, dp_priv->link_configuration);
- 			if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv))
 -			if (IS_eDP(intel_encoder)) {
++			if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
+ 				ironlake_edp_panel_on(dev);
  				ironlake_edp_backlight_on(dev);
+ 			}
  		}
  	}
  	dp_priv->dpms_mode = mode;