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

diff --cc drivers/char/agp/intel-gtt.c
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index 8359c50e6646e72f469fbc8ecfbb77333d7d79d9,5e21b31198249349dc5e69265dbe20c8b0a23d02..30d89111f55963ac314db1ff9583c7037bcc46d6
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/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 b4f02826676efb9747c52af2b56c683e60d0dcd8,5dde80f9e652ecc213353c59d6969c277869c874..c612981e6195be70c914186866172fc36aa59332
--- 1/drivers/gpu/drm/i915/intel_dp.c
--- 2/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;

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_pm.c
Simple merge