Commit 8c694274 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: make CHICKEN_TRANS() display version aware 



Making register macros platform or display version aware is not exactly
something I want to promote widely, but in this case it's the lesser of
two evils. hsw_chicken_trans_reg() is not pretty, and it doesn't have a
suitable home.

v2: Rebase

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/712c17ee22537b0628aa32695743bc017b3fe332.1731409802.git.jani.nikula@intel.com


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

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

+6 −15
Original line number Diff line number Diff line
@@ -3292,18 +3292,8 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state, 
	trans_port_sync_stop_link_train(state, encoder, crtc_state);

}



/* FIXME bad home for this function */

i915_reg_t hsw_chicken_trans_reg(struct drm_i915_private *i915,

				 enum transcoder cpu_transcoder)

{

	return DISPLAY_VER(i915) >= 14 ?

		MTL_CHICKEN_TRANS(cpu_transcoder) :

		CHICKEN_TRANS(cpu_transcoder);

}



static i915_reg_t

gen9_chicken_trans_reg_by_port(struct drm_i915_private *dev_priv,

			       enum port port)

gen9_chicken_trans_reg_by_port(struct intel_display *display, enum port port)

{

	static const enum transcoder trans[] = {

		[PORT_A] = TRANSCODER_EDP,
@@ -3313,12 +3303,12 @@ gen9_chicken_trans_reg_by_port(struct drm_i915_private *dev_priv, 
		[PORT_E] = TRANSCODER_A,

	};



	drm_WARN_ON(&dev_priv->drm, DISPLAY_VER(dev_priv) < 9);

	drm_WARN_ON(display->drm, DISPLAY_VER(display) < 9);



	if (drm_WARN_ON(&dev_priv->drm, port < PORT_A || port > PORT_E))

	if (drm_WARN_ON(display->drm, port < PORT_A || port > PORT_E))

		port = PORT_A;



	return CHICKEN_TRANS(trans[port]);

	return CHICKEN_TRANS(display, trans[port]);

}



static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,
@@ -3326,6 +3316,7 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state, 
				  const struct intel_crtc_state *crtc_state,

				  const struct drm_connector_state *conn_state)

{

	struct intel_display *display = to_intel_display(encoder);

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

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct drm_connector *connector = conn_state->connector;
@@ -3356,7 +3347,7 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state, 
		 * the bits affect a specific DDI port rather than

		 * a specific transcoder.

		 */

		i915_reg_t reg = gen9_chicken_trans_reg_by_port(dev_priv, port);

		i915_reg_t reg = gen9_chicken_trans_reg_by_port(display, port);

		u32 val;



		val = intel_de_read(dev_priv, reg);

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

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ i915_reg_t dp_tp_ctl_reg(struct intel_encoder *encoder, 
			 const struct intel_crtc_state *crtc_state);

i915_reg_t dp_tp_status_reg(struct intel_encoder *encoder,

			    const struct intel_crtc_state *crtc_state);

i915_reg_t hsw_chicken_trans_reg(struct drm_i915_private *i915,

				 enum transcoder cpu_transcoder);

void intel_ddi_fdi_post_disable(struct intel_atomic_state *state,

				struct intel_encoder *intel_encoder,

				const struct intel_crtc_state *old_crtc_state,

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

+8 −7
Original line number Diff line number Diff line
@@ -511,6 +511,7 @@ void vlv_wait_port_ready(struct intel_display *display, 


void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state)

{

	struct intel_display *display = to_intel_display(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);

	enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;
@@ -554,8 +555,7 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state) 
		if (DISPLAY_VER(dev_priv) == 14)

			set |= DP_FEC_BS_JITTER_WA;



		intel_de_rmw(dev_priv,

			     hsw_chicken_trans_reg(dev_priv, cpu_transcoder),

		intel_de_rmw(display, CHICKEN_TRANS(display, cpu_transcoder),

			     clear, set);

	}
@@ -591,6 +591,7 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state) 


void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state)

{

	struct intel_display *display = to_intel_display(old_crtc_state);

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

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

	enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;
@@ -628,7 +629,7 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state) 
	intel_de_write(dev_priv, TRANSCONF(dev_priv, cpu_transcoder), val);



	if (DISPLAY_VER(dev_priv) >= 12)

		intel_de_rmw(dev_priv, hsw_chicken_trans_reg(dev_priv, cpu_transcoder),

		intel_de_rmw(display, CHICKEN_TRANS(display, cpu_transcoder),

			     FECSTALL_DIS_DPTSTREAM_DPTTG, 0);



	if ((val & TRANSCONF_ENABLE) == 0)
@@ -1744,10 +1745,9 @@ static void hsw_set_linetime_wm(const struct intel_crtc_state *crtc_state) 


static void hsw_set_frame_start_delay(const struct intel_crtc_state *crtc_state)

{

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

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

	struct intel_display *display = to_intel_display(crtc_state);



	intel_de_rmw(i915, hsw_chicken_trans_reg(i915, crtc_state->cpu_transcoder),

	intel_de_rmw(display, CHICKEN_TRANS(display, crtc_state->cpu_transcoder),

		     HSW_FRAME_START_DELAY_MASK,

		     HSW_FRAME_START_DELAY(crtc_state->framestart_delay - 1));

}
@@ -4112,6 +4112,7 @@ static void intel_joiner_get_config(struct intel_crtc_state *crtc_state) 
static bool hsw_get_pipe_config(struct intel_crtc *crtc,

				struct intel_crtc_state *pipe_config)

{

	struct intel_display *display = to_intel_display(crtc);

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

	bool active;

	u32 tmp;
@@ -4188,7 +4189,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc, 
	}



	if (!transcoder_is_dsi(pipe_config->cpu_transcoder)) {

		tmp = intel_de_read(dev_priv, hsw_chicken_trans_reg(dev_priv, pipe_config->cpu_transcoder));

		tmp = intel_de_read(display, CHICKEN_TRANS(display, pipe_config->cpu_transcoder));



		pipe_config->framestart_delay = REG_FIELD_GET(HSW_FRAME_START_DELAY_MASK, tmp) + 1;

	} else {

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

+2 −2
Original line number Diff line number Diff line
@@ -1326,8 +1326,8 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, 
	if (ret < 0)

		intel_dp_queue_modeset_retry_for_link(state, primary_encoder, pipe_config);



	if (DISPLAY_VER(dev_priv) >= 12)

		intel_de_rmw(dev_priv, hsw_chicken_trans_reg(dev_priv, trans),

	if (DISPLAY_VER(display) >= 12)

		intel_de_rmw(display, CHICKEN_TRANS(display, trans),

			     FECSTALL_DIS_DPTSTREAM_DPTTG,

			     pipe_config->fec_enable ? FECSTALL_DIS_DPTSTREAM_DPTTG : 0);

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder, 
		rekey_reg = TRANS_DDI_FUNC_CTL(display, hdcp->cpu_transcoder);

		rekey_bit = TRANS_DDI_HDCP_LINE_REKEY_DISABLE;

	} else if (IS_DISPLAY_VERx100_STEP(display, 1400, STEP_D0, STEP_FOREVER)) {

		rekey_reg = MTL_CHICKEN_TRANS(hdcp->cpu_transcoder);

		rekey_reg = CHICKEN_TRANS(display, hdcp->cpu_transcoder);

		rekey_bit = HDCP_LINE_REKEY_DISABLE;

	}