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

Commit b8aea3d1 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/bxt: Don't uninit/init display core twice during system suspend/resume 



Atm, we run the BSpec display core uninit/init sequences twice during
system suspend/resume. While this shouldn't cause any problem, it's
redundant, so get rid of the duplicate call.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarBob Paauwe <bob.j.paauwe@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461173277-16090-3-git-send-email-imre.deak@intel.com
parent 507e126e

drivers/gpu/drm/i915/i915_drv.c

+4 −6
Original line number Diff line number Diff line
@@ -668,10 +668,9 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) 
		intel_power_domains_suspend(dev_priv);



	ret = 0;

	if (IS_BROXTON(dev_priv)) {

		bxt_display_core_uninit(dev_priv);

	if (IS_BROXTON(dev_priv))

		bxt_enable_dc9(dev_priv);

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

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

		hsw_enable_pc8(dev_priv);

	else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		ret = vlv_suspend_complete(dev_priv);
@@ -868,10 +867,9 @@ static int i915_drm_resume_early(struct drm_device *dev) 


	intel_uncore_early_sanitize(dev, true);



	if (IS_BROXTON(dev)) {

	if (IS_BROXTON(dev))

		bxt_disable_dc9(dev_priv);

		bxt_display_core_init(dev_priv, true);

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

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

		hsw_disable_pc8(dev_priv);



	intel_uncore_sanitize(dev);