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

Commit 68f60946 authored by Hans de Goede's avatar Hans de Goede Committed by Daniel Vetter
Browse files

drm/i915: Add intel_uncore_suspend / resume functions 

Rename intel_uncore_early_sanitize to intel_uncore_resume, dropping the
(always true) restore_forcewake argument and add a new intel_uncore_resume
function to replace the intel_uncore_forcewake_reset(dev_priv, false)
calls done from the suspend / runtime_suspend functions and make
intel_uncore_forcewake_reset private.

This is a preparation patch for adding PMIC bus access notifier support.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=155241


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatartagorereddy <tagore.chandan@gmail.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170210102802.20898-12-hdegoede@redhat.com
parent d93a6ed3

drivers/gpu/drm/i915/i915_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ static int i915_drm_suspend(struct drm_device *dev) 
	opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold;

	intel_opregion_notify_adapter(dev_priv, opregion_target_state);



	intel_uncore_forcewake_reset(dev_priv, false);

	intel_uncore_suspend(dev_priv);

	intel_opregion_unregister(dev_priv);



	intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
@@ -1701,7 +1701,7 @@ static int i915_drm_resume_early(struct drm_device *dev) 
		DRM_ERROR("Resume prepare failed: %d, continuing anyway\n",

			  ret);



	intel_uncore_early_sanitize(dev_priv, true);

	intel_uncore_resume_early(dev_priv);



	if (IS_GEN9_LP(dev_priv)) {

		if (!dev_priv->suspended_to_idle)
@@ -2343,7 +2343,7 @@ static int intel_runtime_suspend(struct device *kdev) 
		return ret;

	}



	intel_uncore_forcewake_reset(dev_priv, false);

	intel_uncore_suspend(dev_priv);



	enable_rpm_wakeref_asserts(dev_priv);

	WARN_ON_ONCE(atomic_read(&dev_priv->pm.wakeref_count));

drivers/gpu/drm/i915/i915_drv.h

+2 −4
Original line number Diff line number Diff line
@@ -2984,14 +2984,12 @@ int intel_irq_install(struct drm_i915_private *dev_priv); 
void intel_irq_uninstall(struct drm_i915_private *dev_priv);



extern void intel_uncore_sanitize(struct drm_i915_private *dev_priv);

extern void intel_uncore_early_sanitize(struct drm_i915_private *dev_priv,

					bool restore_forcewake);

extern void intel_uncore_init(struct drm_i915_private *dev_priv);

extern bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv);

extern bool intel_uncore_arm_unclaimed_mmio_detection(struct drm_i915_private *dev_priv);

extern void intel_uncore_fini(struct drm_i915_private *dev_priv);

extern void intel_uncore_forcewake_reset(struct drm_i915_private *dev_priv,

					 bool restore);

extern void intel_uncore_suspend(struct drm_i915_private *dev_priv);

extern void intel_uncore_resume_early(struct drm_i915_private *dev_priv);

const char *intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id);

void intel_uncore_forcewake_get(struct drm_i915_private *dev_priv,

				enum forcewake_domains domains);

drivers/gpu/drm/i915/intel_uncore.c

+9 −5
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ intel_uncore_fw_release_timer(struct hrtimer *timer) 
	return HRTIMER_NORESTART;

}



void intel_uncore_forcewake_reset(struct drm_i915_private *dev_priv,

static void intel_uncore_forcewake_reset(struct drm_i915_private *dev_priv,

					 bool restore)

{

	unsigned long irqflags;
@@ -427,10 +427,14 @@ static void __intel_uncore_early_sanitize(struct drm_i915_private *dev_priv, 
	intel_uncore_forcewake_reset(dev_priv, restore_forcewake);

}



void intel_uncore_early_sanitize(struct drm_i915_private *dev_priv,

				 bool restore_forcewake)

void intel_uncore_suspend(struct drm_i915_private *dev_priv)

{

	intel_uncore_forcewake_reset(dev_priv, false);

}



void intel_uncore_resume_early(struct drm_i915_private *dev_priv)

{

	__intel_uncore_early_sanitize(dev_priv, restore_forcewake);

	__intel_uncore_early_sanitize(dev_priv, true);

	i915_check_and_clear_faults(dev_priv);

}