Commit 75e57145 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/pps: rename vlv_pps_init() to vlv_pps_port_enable_unlocked() 



Follow the naming for vlv_pps_port_disable(), as these are counterparts,
and add _unlocked suffix as it assumes the pps lock is held.

v2: Add _unlocked suffix (Ville)

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/3b21141025a5e1e67f28bbe67a82a7008fd3f415.1726681620.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 696e909e

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

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ static void intel_enable_dp(struct intel_atomic_state *state, 


	with_intel_pps_lock(intel_dp, wakeref) {

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

			vlv_pps_init(encoder, pipe_config);

			vlv_pps_port_enable_unlocked(encoder, pipe_config);



		intel_dp_enable_port(intel_dp, pipe_config);

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

+3 −2
Original line number Diff line number Diff line
@@ -1227,7 +1227,8 @@ void vlv_pps_pipe_reset(struct intel_dp *intel_dp) 
		intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);

}



void vlv_pps_init(struct intel_encoder *encoder,

/* Call on all DP, not just eDP */

void vlv_pps_port_enable_unlocked(struct intel_encoder *encoder,

				  const struct intel_crtc_state *crtc_state)

{

	struct intel_display *display = to_intel_display(encoder);

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

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ void intel_pps_reset_all(struct intel_display *display); 


void vlv_pps_pipe_init(struct intel_dp *intel_dp);

void vlv_pps_pipe_reset(struct intel_dp *intel_dp);

void vlv_pps_init(struct intel_encoder *encoder,

void vlv_pps_port_enable_unlocked(struct intel_encoder *encoder,

				  const struct intel_crtc_state *crtc_state);

void vlv_pps_port_disable(struct intel_encoder *encoder,

			  const struct intel_crtc_state *crtc_state);