Commit 1afd9b4c authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/pps: add vlv_pps_pipe_reset() 



We need to track PPS also for non-eDP usage on VLV/CHV. Add new
vlv_pps_pipe_reset() for resetting the related parts, hiding the PPS
pipe details inside PPS code.

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


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

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

+2 −6
Original line number Diff line number Diff line
@@ -1273,12 +1273,8 @@ static void intel_dp_encoder_reset(struct drm_encoder *encoder) 


	intel_dp->reset_link_params = true;



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

		intel_wakeref_t wakeref;



		with_intel_pps_lock(intel_dp, wakeref)

			intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);

	}

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

		vlv_pps_pipe_reset(intel_dp);



	intel_pps_encoder_reset(intel_dp);

}

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

+9 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,15 @@ void vlv_pps_pipe_init(struct intel_dp *intel_dp) 
	intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);

}



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

void vlv_pps_pipe_reset(struct intel_dp *intel_dp)

{

	intel_wakeref_t wakeref;



	with_intel_pps_lock(intel_dp, wakeref)

		intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);

}



void vlv_pps_init(struct intel_encoder *encoder,

		  const struct intel_crtc_state *crtc_state)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ void intel_pps_encoder_reset(struct intel_dp *intel_dp); 
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,

		  const struct intel_crtc_state *crtc_state);