Commit 21fd23ac authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move pipe, pch and vblank enable to encoders on DDI platforms 



To allow better flexibility for encoder specific code, push
intel_enable_pipe(), lpt_pch_enable() and intel_crtc_vblank_on() down to
the encoders from hsw_crtc_enable().

There's slight duplication, but also more clarity with the reduced
conditional statements.

Cc: Vandita Kulkarni <vandita.kulkarni@intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVandita Kulkarni <vandita.kulkarni@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128162850.8660-1-jani.nikula@intel.com
parent 219cee8f

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

+10 −0
Original line number Diff line number Diff line
@@ -1127,6 +1127,15 @@ static void gen11_dsi_pre_enable(struct intel_encoder *encoder, 
	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);

}



static void gen11_dsi_enable(struct intel_encoder *encoder,

			     const struct intel_crtc_state *crtc_state,

			     const struct drm_connector_state *conn_state)

{

	WARN_ON(crtc_state->has_pch_encoder);



	intel_crtc_vblank_on(crtc_state);

}



static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
@@ -1747,6 +1756,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) 


	encoder->pre_pll_enable = gen11_dsi_pre_pll_enable;

	encoder->pre_enable = gen11_dsi_pre_enable;

	encoder->enable = gen11_dsi_enable;

	encoder->disable = gen11_dsi_disable;

	encoder->post_disable = gen11_dsi_post_disable;

	encoder->port = port;

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

+6 −0
Original line number Diff line number Diff line
@@ -301,6 +301,12 @@ static void hsw_enable_crt(struct intel_encoder *encoder, 


	WARN_ON(!crtc_state->has_pch_encoder);



	intel_enable_pipe(crtc_state);



	lpt_pch_enable(crtc_state);



	intel_crtc_vblank_on(crtc_state);



	intel_crt_set_dpms(encoder, crtc_state, DRM_MODE_DPMS_ON);



	intel_wait_for_vblank(dev_priv, pipe);

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

+6 −0
Original line number Diff line number Diff line
@@ -3993,6 +3993,12 @@ static void intel_enable_ddi(struct intel_encoder *encoder, 
			     const struct intel_crtc_state *crtc_state,

			     const struct drm_connector_state *conn_state)

{

	WARN_ON(crtc_state->has_pch_encoder);



	intel_enable_pipe(crtc_state);



	intel_crtc_vblank_on(crtc_state);



	if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))

		intel_enable_ddi_hdmi(encoder, crtc_state, conn_state);

	else

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

+3 −13
Original line number Diff line number Diff line
@@ -1814,7 +1814,7 @@ static u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_state 
		return 0; /* Gen2 doesn't have a hardware frame counter */

}













static void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state)













void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state)















{















	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);























@@ -1832,7 +1832,7 @@ void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state)













	assert_vblank_disabled(&crtc->base);















}



























static void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state)













void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state)















{















	struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);















	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);










@@ -5864,8 +5864,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,













	ilk_enable_pch_transcoder(crtc_state);















}



























static void lpt_pch_enable(const struct intel_atomic_state *state,













			   const struct intel_crtc_state *crtc_state)













void lpt_pch_enable(const struct intel_crtc_state *crtc_state)















{















	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);















	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);










@@ -7041,15 +7040,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,













	if (INTEL_GEN(dev_priv) >= 11)















		icl_pipe_mbus_enable(crtc);



























	/* XXX: Do the pipe assertions at the right place for BXT DSI. */













	if (!transcoder_is_dsi(cpu_transcoder))













		intel_enable_pipe(new_crtc_state);

























	if (new_crtc_state->has_pch_encoder)













		lpt_pch_enable(state, new_crtc_state);

























	intel_crtc_vblank_on(new_crtc_state);



























	intel_encoders_enable(state, crtc);





























	if (psl_clkgate_wa) {

































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



+3
−0






























Original line number
Diff line number
Diff line








@@ -486,6 +486,7 @@ enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port);













bool is_trans_port_sync_mode(const struct intel_crtc_state *state);































void intel_plane_destroy(struct drm_plane *plane);













void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state);















void intel_disable_pipe(const struct intel_crtc_state *old_crtc_state);















void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);















void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);









@@ -495,6 +496,7 @@ int vlv_get_cck_clock(struct drm_i915_private *dev_priv,













		      const char *name, u32 reg, int ref_freq);















int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,















			   const char *name, u32 reg);













void lpt_pch_enable(const struct intel_crtc_state *crtc_state);















void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv);















void lpt_disable_iclkip(struct drm_i915_private *dev_priv);















void intel_init_display_hooks(struct drm_i915_private *dev_priv);









@@ -520,6 +522,7 @@ enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv,













int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,















				      struct drm_file *file_priv);















u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc);













void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state);















void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state);































int ilk_get_lanes_required(int target_clock, int link_bw, int bpp);









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE