From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 16 Jan 2014 21:06:30 +0000 (+0100)
Subject: Merge commit origin/master into drm-intel-next
X-Git-Tag: v3.14-rc1~47^2~16^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d9d349d8788d30f3fc3bb39279c370f94d9dbec;p=kernel%2Fkernel-generic.git

Merge commit origin/master into drm-intel-next

Conflicts are getting out of hand, and now we have to shuffle even
more in -next which was also shuffled in -fixes (the call for
drm_mode_config_reset needs to move yet again).

So do a proper backmerge. I wanted to wait with this for the 3.13
relaese, but alas let's just do this now.

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_ddi.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_pm.c

Besides the conflict around the forcewake get/put (where we chaged the
called function in -fixes and added a new parameter in -next) code all
the current conflicts are of the adjacent lines changed type.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

0d9d349d8788d30f3fc3bb39279c370f94d9dbec
diff --cc drivers/gpu/drm/i915/intel_ddi.c
index cec06a5,b69dc3e..74749c6
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@@ -1235,9 -1164,10 +1241,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 9db009c,2bde35d..e77d4b8
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -6614,7 -6402,7 +6614,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! */
- 	dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
 -	gen6_gt_force_wake_get(dev_priv);
++	gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL);
  
  	if (val & LCPLL_POWER_DOWN_ALLOW) {
  		val &= ~LCPLL_POWER_DOWN_ALLOW;
@@@ -6648,7 -6436,7 +6648,7 @@@
  			DRM_ERROR("Switching back to LCPLL failed\n");
  	}
  
- 	dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
 -	gen6_gt_force_wake_put(dev_priv);
++	gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
  }
  
  void hsw_enable_pc8_work(struct work_struct *__work)
@@@ -10816,11 -10541,25 +10816,20 @@@ static struct intel_quirk intel_quirks[
  	/* Sony Vaio Y cannot use SSC on LVDS */
  	{ 0x0046, 0x104d, 0x9076, quirk_ssc_force_disable },
  
- 	/*
- 	 * All GM45 Acer (and its brands eMachines and Packard Bell) laptops
- 	 * seem to use inverted backlight PWM.
- 	 */
- 	{ 0x2a42, 0x1025, PCI_ANY_ID, quirk_invert_brightness },
+ 	/* Acer Aspire 5734Z must invert backlight brightness */
+ 	{ 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },
+ 
+ 	/* Acer/eMachines G725 */
+ 	{ 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },
+ 
+ 	/* Acer/eMachines e725 */
+ 	{ 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },
+ 
+ 	/* Acer/Packard Bell NCL20 */
+ 	{ 0x2a42, 0x1025, 0x034b, quirk_invert_brightness },
+ 
+ 	/* Acer Aspire 4736Z */
+ 	{ 0x2a42, 0x1025, 0x0260, quirk_invert_brightness },
 -
 -	/* Dell XPS13 HD Sandy Bridge */
 -	{ 0x0116, 0x1028, 0x052e, quirk_no_pcm_pwm_enable },
 -	/* Dell XPS13 HD and XPS13 FHD Ivy Bridge */
 -	{ 0x0166, 0x1028, 0x058b, quirk_no_pcm_pwm_enable },
  };
  
  static void intel_init_quirks(struct drm_device *dev)
diff --cc drivers/gpu/drm/i915/intel_pm.c
index 9998185,26c29c1..d77cc81
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -5719,10 -6146,17 +5720,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;