Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a6b73a authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915/bxt: Also add bxt_resume_prepare() to the S3/S4 path 



Currently bxt_resume_prepare() is only used in the runtime-resume path.
Add it to the full S3/S4 path as well.

v2: Rebase on top of the vlv_resume_prepare() shuffling around

Cc: Imre Deak <imre.deak@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com> (v1)
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1e8df167

drivers/gpu/drm/i915/i915_drv.c

+5 −2
Original line number Diff line number Diff line
@@ -595,6 +595,7 @@ 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);





static int i915_drm_suspend(struct drm_device *dev)
@@ -815,10 +816,12 @@ static int i915_drm_resume_early(struct drm_device *dev) 


	intel_uncore_early_sanitize(dev, true);



	if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))

		hsw_disable_pc8(dev_priv);

	if (IS_BROXTON(dev))

		ret = bxt_resume_prepare(dev_priv);

	else if (IS_SKYLAKE(dev_priv))

		ret = skl_resume_prepare(dev_priv);

	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))

		hsw_disable_pc8(dev_priv);



	intel_uncore_sanitize(dev);

	intel_power_domains_init_hw(dev_priv);