From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 18 Jun 2014 09:44:05 +0000 (+0200)
Subject: Merge branch 'topic/soix' into drm-intel-next-queued
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d0cf3d6e07957502dae8602e2f96eb6790ddc13;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'topic/soix' into drm-intel-next-queued

Jesse's SOix work required some patches from acpi-next, so pull it in
through a topic barnch.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c

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

5d0cf3d6e07957502dae8602e2f96eb6790ddc13
diff --cc drivers/gpu/drm/i915/i915_drv.c
index 5a08c86cb1ab,3536bfe537dd..7ae4e2a20493
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -600,7 -616,10 +610,10 @@@ static int i915_drm_thaw_early(struct d
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
  
+ 	if (IS_HASWELL(dev) || IS_BROADWELL(dev))
+ 		hsw_disable_pc8(dev_priv);
+ 
 -	intel_uncore_early_sanitize(dev);
 +	intel_uncore_early_sanitize(dev, true);
  	intel_uncore_sanitize(dev);
  	intel_power_domains_init_hw(dev_priv);
  
diff --cc drivers/gpu/drm/i915/intel_pm.c
index 6cd11aaf0bb4,49122204a001..8148d06b5b5e
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -4877,15 -4705,11 +4897,13 @@@ void intel_disable_gt_powersave(struct 
  	if (IS_IRONLAKE_M(dev)) {
  		ironlake_disable_drps(dev);
  		ironlake_disable_rc6(dev);
 -	} else if (IS_GEN6(dev) || IS_GEN7(dev) || IS_BROADWELL(dev)) {
 +	} else if (INTEL_INFO(dev)->gen >= 6) {
- 		if (cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work))
- 			intel_runtime_pm_put(dev_priv);
+ 		intel_suspend_gt_powersave(dev);
  
- 		cancel_work_sync(&dev_priv->rps.work);
  		mutex_lock(&dev_priv->rps.hw_lock);
 -		if (IS_VALLEYVIEW(dev))
 +		if (IS_CHERRYVIEW(dev))
 +			cherryview_disable_rps(dev);
 +		else if (IS_VALLEYVIEW(dev))
  			valleyview_disable_rps(dev);
  		else
  			gen6_disable_rps(dev);