Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
	drivers/gpu/drm/i915/intel_ddi.c
	drivers/gpu/drm/i915/intel_display.c

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_ddi.c
index 526c8ded16b03bc334846609a47e2d0bfc07c58c,cec06a5453cc4a839154dd207edc7d0d699ea099..1488b281b9957a394dd8d6f7230acdd9c145ef52
--- 1/drivers/gpu/drm/i915/intel_ddi.c
--- 2/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@@ -1158,10 -1235,9 +1235,10 @@@ static void intel_ddi_post_disable(stru
        if (wait)
                intel_wait_ddi_buf_idle(dev_priv, port);
  
 -      if (type == INTEL_OUTPUT_EDP) {
 +      if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {
                struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
-               ironlake_edp_panel_vdd_on(intel_dp);
+ 
 +              intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
                ironlake_edp_panel_off(intel_dp);
        }
  

diff --cc drivers/gpu/drm/i915/intel_display.c
index 8b8bde7dce53abce2fea3c655e06ef765433d50f,a40651ef525c3a3248f21518f54625a490ef703e..976a9edb741a00a321d551ac4346b5f194864c61
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -6402,7 -6592,7 +6592,7 @@@ static void hsw_restore_lcpll(struct dr
  
        /* Make sure we're not on PC8 state before disabling PC8, otherwise
         * we'll hang the machine! */
-       gen6_gt_force_wake_get(dev_priv);
 -      dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
++      gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL);
  
        if (val & LCPLL_POWER_DOWN_ALLOW) {
                val &= ~LCPLL_POWER_DOWN_ALLOW;
@@@ -6436,7 -6626,7 +6626,7 @@@
                        DRM_ERROR("Switching back to LCPLL failed\n");
        }
  
-       gen6_gt_force_wake_put(dev_priv);
 -      dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
++      gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
  }
  
  void hsw_enable_pc8_work(struct work_struct *__work)

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

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

diff --cc drivers/gpu/drm/i915/intel_pm.c
index 3657ab43c8fd1e20fc9deb10856166b4c35ec0d4,c68abf7188256b18bcd856baea9ae3e0b4992e54..013c52297367a56802e95e2638fae0f9d41b68f1
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -6136,17 -6271,10 +6272,10 @@@ int vlv_freq_opcode(struct drm_i915_pri
                return -1;
        }
  
-       val /= mult;
-       val -= base / mult;
-       val += 0xbd;
- 
-       if (val > 0xea)
-               val = 0xea;
- 
-       return val;
+       return DIV_ROUND_CLOSEST(4 * mul * val, dev_priv->mem_freq) + 0xbd - 6;
  }
  
 -void intel_pm_init(struct drm_device *dev)
 +void intel_pm_setup(struct drm_device *dev)
  {
        struct drm_i915_private *dev_priv = dev->dev_private;