Commit d361ae26 authored Mar 07, 2014 by Paulo Zanoni Committed by Daniel Vetter Mar 19, 2014

drm/i915: make intel_aux_display_runtime_get get runtime PM, not PC8



Because we merged the PC8 and runtime PM features, so calling
intel_runtime_pm_get now has the same meaning, and we plan to just
remove hsw_disable_package_c8 for this exact reason.

My first patch tried to completely kill
intel_aux_display_runtime_get/put, because I was assuming that whoever
needed more than just runtime PM would have to get the appropriate
power domain instead of that, but it seems some people still want the
intel_aux_display_runtime_get abstraction, so keep it until someone
else tries to replace it with the more-standard power domain calls.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent db8384f2

drivers/gpu/drm/i915/intel_pm.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -5888,15 +5888,14 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv)
		intel_power_domains_resume(dev_priv);
		}

		/* Disables PC8 so we can use the GMBUS and DP AUX interrupts. */
		void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv)
		{
		hsw_disable_package_c8(dev_priv);
		intel_runtime_pm_get(dev_priv);
		}

		void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv)
		{
		hsw_enable_package_c8(dev_priv);
		intel_runtime_pm_put(dev_priv);
		}

		void intel_runtime_pm_get(struct drm_i915_private *dev_priv)