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>

diff --cc drivers/gpu/drm/i915/i915_drv.c
index 5a08c86,3536bfe..7ae4e2a
--- 1/drivers/gpu/drm/i915/i915_drv.c
--- 2/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;
  
 -      intel_uncore_early_sanitize(dev);
+       if (IS_HASWELL(dev) || IS_BROADWELL(dev))
+               hsw_disable_pc8(dev_priv);
+ 
 +      intel_uncore_early_sanitize(dev, true);
        intel_uncore_sanitize(dev);
        intel_power_domains_init_hw(dev_priv);
  

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

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

diff --cc drivers/gpu/drm/i915/intel_pm.c
index 6cd11aa,4912220..8148d06
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/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);

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