| Message ID | 1447084107-8521-13-git-send-email-patrik.jakobsson@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On ma, 2015-11-09 at 16:48 +0100, Patrik Jakobsson wrote: > Signed-off-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 17 ----------------- > 1 file changed, 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c > b/drivers/gpu/drm/i915/i915_drv.c > index 0c7f435..77d183d 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -622,7 +622,6 @@ static void intel_suspend_encoders(struct > drm_i915_private *dev_priv) > static int intel_suspend_complete(struct drm_i915_private > *dev_priv); > static int vlv_resume_prepare(struct drm_i915_private *dev_priv, > bool rpm_resume); > -static int skl_resume_prepare(struct drm_i915_private *dev_priv); > static int bxt_resume_prepare(struct drm_i915_private *dev_priv); > > > @@ -857,8 +856,6 @@ static int i915_drm_resume_early(struct > drm_device *dev) > > if (IS_BROXTON(dev)) > ret = bxt_resume_prepare(dev_priv); > - else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) > - ret = skl_resume_prepare(dev_priv); > else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > hsw_disable_pc8(dev_priv); > > @@ -1070,11 +1067,6 @@ static int i915_pm_resume(struct device *dev) > return i915_drm_resume(drm_dev); > } > > -static int skl_suspend_complete(struct drm_i915_private *dev_priv) > -{ > - return 0; > -} > - > static int hsw_suspend_complete(struct drm_i915_private *dev_priv) > { > hsw_enable_pc8(dev_priv); > @@ -1114,11 +1106,6 @@ static int bxt_resume_prepare(struct > drm_i915_private *dev_priv) > return 0; > } > > -static int skl_resume_prepare(struct drm_i915_private *dev_priv) > -{ > - return 0; > -} > - > /* > * Save all Gunit registers that may be lost after a D3 and a > subsequent > * S0i[R123] transition. The list of registers needing a > save/restore is > @@ -1582,8 +1569,6 @@ static int intel_runtime_resume(struct device > *device) > > if (IS_BROXTON(dev)) > ret = bxt_resume_prepare(dev_priv); > - else if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) > - ret = skl_resume_prepare(dev_priv); > else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > hsw_disable_pc8(dev_priv); > else if (IS_VALLEYVIEW(dev_priv)) > @@ -1626,8 +1611,6 @@ static int intel_suspend_complete(struct > drm_i915_private *dev_priv) > > if (IS_BROXTON(dev_priv)) > ret = bxt_suspend_complete(dev_priv); > - else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) > - ret = skl_suspend_complete(dev_priv); > else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > ret = hsw_suspend_complete(dev_priv); > else if (IS_VALLEYVIEW(dev_priv))
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0c7f435..77d183d 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -622,7 +622,6 @@ static void intel_suspend_encoders(struct drm_i915_private *dev_priv) static int intel_suspend_complete(struct drm_i915_private *dev_priv); static int vlv_resume_prepare(struct drm_i915_private *dev_priv, bool rpm_resume); -static int skl_resume_prepare(struct drm_i915_private *dev_priv); static int bxt_resume_prepare(struct drm_i915_private *dev_priv); @@ -857,8 +856,6 @@ static int i915_drm_resume_early(struct drm_device *dev) if (IS_BROXTON(dev)) ret = bxt_resume_prepare(dev_priv); - else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) - ret = skl_resume_prepare(dev_priv); else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) hsw_disable_pc8(dev_priv); @@ -1070,11 +1067,6 @@ static int i915_pm_resume(struct device *dev) return i915_drm_resume(drm_dev); } -static int skl_suspend_complete(struct drm_i915_private *dev_priv) -{ - return 0; -} - static int hsw_suspend_complete(struct drm_i915_private *dev_priv) { hsw_enable_pc8(dev_priv); @@ -1114,11 +1106,6 @@ static int bxt_resume_prepare(struct drm_i915_private *dev_priv) return 0; } -static int skl_resume_prepare(struct drm_i915_private *dev_priv) -{ - return 0; -} - /* * Save all Gunit registers that may be lost after a D3 and a subsequent * S0i[R123] transition. The list of registers needing a save/restore is @@ -1582,8 +1569,6 @@ static int intel_runtime_resume(struct device *device) if (IS_BROXTON(dev)) ret = bxt_resume_prepare(dev_priv); - else if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) - ret = skl_resume_prepare(dev_priv); else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) hsw_disable_pc8(dev_priv); else if (IS_VALLEYVIEW(dev_priv)) @@ -1626,8 +1611,6 @@ static int intel_suspend_complete(struct drm_i915_private *dev_priv) if (IS_BROXTON(dev_priv)) ret = bxt_suspend_complete(dev_priv); - else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) - ret = skl_suspend_complete(dev_priv); else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) ret = hsw_suspend_complete(dev_priv); else if (IS_VALLEYVIEW(dev_priv))
Signed-off-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 17 ----------------- 1 file changed, 17 deletions(-)