Commit 764f6729 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Split intel_ddi_encoder_reset() from intel_dp_encoder_reset() 



Most of intel_dp_encoder_reset() is for pre-ddi platforms.
Make a clean split.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210318161015.22070-5-ville.syrjala@linux.intel.com
parent b2ef0661

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

+10 −1
Original line number Diff line number Diff line
@@ -4017,8 +4017,17 @@ static void intel_ddi_encoder_destroy(struct drm_encoder *encoder) 
	kfree(dig_port);

}



static void intel_ddi_encoder_reset(struct drm_encoder *encoder)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder));



	intel_dp->reset_link_params = true;



	intel_pps_encoder_reset(intel_dp);

}



static const struct drm_encoder_funcs intel_ddi_funcs = {

	.reset = intel_dp_encoder_reset,

	.reset = intel_ddi_encoder_reset,

	.destroy = intel_ddi_encoder_destroy,

};

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

+2 −3
Original line number Diff line number Diff line
@@ -5736,12 +5736,11 @@ static enum pipe vlv_active_pipe(struct intel_dp *intel_dp) 
	return INVALID_PIPE;

}



void intel_dp_encoder_reset(struct drm_encoder *encoder)

static void intel_dp_encoder_reset(struct drm_encoder *encoder)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->dev);

	struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder));



	if (!HAS_DDI(dev_priv))

	intel_dp->DP = intel_de_read(dev_priv, intel_dp->output_reg);



	intel_dp->reset_link_params = true;

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

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp, 
void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp,

					   const struct intel_crtc_state *crtc_state,

					   bool enable);

void intel_dp_encoder_reset(struct drm_encoder *encoder);

void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder);

void intel_dp_encoder_shutdown(struct intel_encoder *intel_encoder);

void intel_dp_encoder_flush_work(struct drm_encoder *encoder);