Commit 07eb5b1f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/pps: rename intel_power_sequencer_reset to intel_pps_reset_all 



Follow the usual naming pattern for functions. "reset all" because it
iterates over all DP encoders. No functional changes.

Reviewed-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b10013e2c976ca140b1ad62669e18a2e9f1e8c35.1610127741.git.jani.nikula@intel.com
parent c94287f1

drivers/gpu/drm/i915/display/intel_display_power.c

+2 −2
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ static void bxt_enable_dc9(struct drm_i915_private *dev_priv) 
	 * because PPS registers are always on.

	 */

	if (!HAS_PCH_SPLIT(dev_priv))

		intel_power_sequencer_reset(dev_priv);

		intel_pps_reset_all(dev_priv);

	gen9_set_dc_state(dev_priv, DC_STATE_EN_DC9);

}
@@ -1446,7 +1446,7 @@ static void vlv_display_power_well_deinit(struct drm_i915_private *dev_priv) 
	/* make sure we're done processing display irqs */

	intel_synchronize_irq(dev_priv);



	intel_power_sequencer_reset(dev_priv);

	intel_pps_reset_all(dev_priv);



	/* Prevent us from re-enabling polling on accident in late suspend */

	if (!dev_priv->drm.dev->power.is_suspended)

drivers/gpu/drm/i915/display/intel_pps.c

+2 −3
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp) 
	intel_wakeref_t wakeref;



	/*

	 * See intel_power_sequencer_reset() why we need

	 * a power domain reference here.

	 * See intel_pps_reset_all() why we need a power domain reference here.

	 */

	wakeref = intel_display_power_get(dev_priv, POWER_DOMAIN_DISPLAY_CORE);

	mutex_lock(&dev_priv->pps_mutex);
@@ -313,7 +312,7 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp) 
	intel_dp_init_panel_power_sequencer_registers(intel_dp, false);

}



void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)

void intel_pps_reset_all(struct drm_i915_private *dev_priv)

{

	struct intel_encoder *encoder;

drivers/gpu/drm/i915/display/intel_pps.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void wait_panel_power_cycle(struct intel_dp *intel_dp); 


void intel_pps_init(struct intel_dp *intel_dp);

void intel_pps_encoder_reset(struct intel_dp *intel_dp);

void intel_power_sequencer_reset(struct drm_i915_private *i915);

void intel_pps_reset_all(struct drm_i915_private *i915);



void vlv_init_panel_power_sequencer(struct intel_encoder *encoder,

				    const struct intel_crtc_state *crtc_state);