Commit 8c66081b authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: s/pipe/transcoder/ when dealing with PIPECONF/TRANSCONF 



PIPECONF becamse TRANSCONF when HSW introduced the EDP transcoder.
Bigjoiner is making life even more confusing by introducing
a N:1 relationship between pipes and transcoders. In that case
we only enable/configure the transcoder corresponding to the
master pipe. Let's do some renames to make it clear we're dealing
with the transcoder rather than pipe when it comes to
PIPECONF/TRANSCONF.

I decided to leave the _cpu_ part out from the function/macro
names since the PCH transcoder related stuff already has a
_pch_ in their name. So shouldn't be possible to confuse them.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913144440.23008-6-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 555ec521

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

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void ilk_edp_pll_on(struct intel_dp *intel_dp, 
	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);

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



	assert_pipe_disabled(dev_priv, pipe_config->cpu_transcoder);

	assert_transcoder_disabled(dev_priv, pipe_config->cpu_transcoder);

	assert_dp_port_disabled(intel_dp);

	assert_edp_pll_disabled(dev_priv);
@@ -251,7 +251,7 @@ static void ilk_edp_pll_off(struct intel_dp *intel_dp, 
	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);

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



	assert_pipe_disabled(dev_priv, old_crtc_state->cpu_transcoder);

	assert_transcoder_disabled(dev_priv, old_crtc_state->cpu_transcoder);

	assert_dp_port_disabled(intel_dp);

	assert_edp_pll_enabled(dev_priv);

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

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state, 


	intel_crtc_vblank_off(old_crtc_state);



	intel_disable_pipe(old_crtc_state);

	intel_disable_transcoder(old_crtc_state);



	intel_ddi_disable_transcoder_func(old_crtc_state);
@@ -314,7 +314,7 @@ static void hsw_enable_crt(struct intel_atomic_state *state, 


	intel_ddi_enable_transcoder_func(encoder, crtc_state);



	intel_enable_pipe(crtc_state);

	intel_enable_transcoder(crtc_state);



	lpt_pch_enable(crtc_state);

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

+2 −2
Original line number Diff line number Diff line
@@ -2867,7 +2867,7 @@ static void intel_ddi_post_disable(struct intel_atomic_state *state, 
	if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) {

		intel_crtc_vblank_off(old_crtc_state);



		intel_disable_pipe(old_crtc_state);

		intel_disable_transcoder(old_crtc_state);



		intel_vrr_disable(old_crtc_state);
@@ -3138,7 +3138,7 @@ static void intel_enable_ddi(struct intel_atomic_state *state, 


	intel_vrr_enable(encoder, crtc_state);



	intel_enable_pipe(crtc_state);

	intel_enable_transcoder(crtc_state);



	intel_crtc_vblank_on(crtc_state);

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

+14 −14
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta 
					 const struct intel_link_m_n *m2_n2);

static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);

static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state);

static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state);

static void hsw_set_transconf(const struct intel_crtc_state *crtc_state);

static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state);

static void ilk_pfit_enable(const struct intel_crtc_state *crtc_state);

static void intel_modeset_setup_hw_state(struct drm_device *dev,
@@ -448,7 +448,7 @@ void assert_panel_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe) 
	     pipe_name(pipe));

}



void assert_pipe(struct drm_i915_private *dev_priv,

void assert_transcoder(struct drm_i915_private *dev_priv,

		       enum transcoder cpu_transcoder, bool state)

{

	bool cur_state;
@@ -766,7 +766,7 @@ enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc) 
		return crtc->pipe;

}



void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state)

void intel_enable_transcoder(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);
@@ -827,7 +827,7 @@ void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state) 
		intel_wait_for_pipe_scanline_moving(crtc);

}



void intel_disable_pipe(const struct intel_crtc_state *old_crtc_state)

void intel_disable_transcoder(const struct intel_crtc_state *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);
@@ -2905,7 +2905,7 @@ static void ilk_crtc_enable(struct intel_atomic_state *state, 


	if (dev_priv->display.initial_watermarks)

		dev_priv->display.initial_watermarks(state, crtc);

	intel_enable_pipe(new_crtc_state);

	intel_enable_transcoder(new_crtc_state);



	if (new_crtc_state->has_pch_encoder)

		ilk_pch_enable(state, new_crtc_state);
@@ -3084,7 +3084,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, 
	}



	if (!transcoder_is_dsi(cpu_transcoder))

		hsw_set_pipeconf(new_crtc_state);

		hsw_set_transconf(new_crtc_state);



	crtc->active = true;
@@ -3179,7 +3179,7 @@ static void ilk_crtc_disable(struct intel_atomic_state *state, 


	intel_crtc_vblank_off(old_crtc_state);



	intel_disable_pipe(old_crtc_state);

	intel_disable_transcoder(old_crtc_state);



	ilk_pfit_disable(old_crtc_state);
@@ -3241,7 +3241,7 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state) 
	 */

	drm_WARN_ON(&dev_priv->drm,

		    intel_de_read(dev_priv, PFIT_CONTROL) & PFIT_ENABLE);

	assert_pipe_disabled(dev_priv, crtc_state->cpu_transcoder);

	assert_transcoder_disabled(dev_priv, crtc_state->cpu_transcoder);



	intel_de_write(dev_priv, PFIT_PGM_RATIOS,

		       crtc_state->gmch_pfit.pgm_ratios);
@@ -3533,7 +3533,7 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state, 
	intel_disable_primary_plane(new_crtc_state);



	dev_priv->display.initial_watermarks(state, crtc);

	intel_enable_pipe(new_crtc_state);

	intel_enable_transcoder(new_crtc_state);



	intel_crtc_vblank_on(new_crtc_state);
@@ -3579,7 +3579,7 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state, 
		dev_priv->display.initial_watermarks(state, crtc);

	else

		intel_update_watermarks(crtc);

	intel_enable_pipe(new_crtc_state);

	intel_enable_transcoder(new_crtc_state);



	intel_crtc_vblank_on(new_crtc_state);
@@ -3598,7 +3598,7 @@ static void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state) 
	if (!old_crtc_state->gmch_pfit.control)

		return;



	assert_pipe_disabled(dev_priv, old_crtc_state->cpu_transcoder);

	assert_transcoder_disabled(dev_priv, old_crtc_state->cpu_transcoder);



	drm_dbg_kms(&dev_priv->drm, "disabling pfit, current: 0x%08x\n",

		    intel_de_read(dev_priv, PFIT_CONTROL));
@@ -3624,7 +3624,7 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state, 


	intel_crtc_vblank_off(old_crtc_state);



	intel_disable_pipe(old_crtc_state);

	intel_disable_transcoder(old_crtc_state);



	i9xx_pfit_disable(old_crtc_state);
@@ -5194,7 +5194,7 @@ static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state) 
	intel_de_posting_read(dev_priv, PIPECONF(pipe));

}



static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state)

static void hsw_set_transconf(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);

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

+6 −6
Original line number Diff line number Diff line
@@ -531,8 +531,8 @@ 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 intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state);

void intel_disable_transcoder(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);

enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc);
@@ -657,10 +657,10 @@ void assert_fdi_rx_pll(struct drm_i915_private *dev_priv, 
		       enum pipe pipe, bool state);

#define assert_fdi_rx_pll_enabled(d, p) assert_fdi_rx_pll(d, p, true)

#define assert_fdi_rx_pll_disabled(d, p) assert_fdi_rx_pll(d, p, false)

void assert_pipe(struct drm_i915_private *dev_priv,

void assert_transcoder(struct drm_i915_private *dev_priv,

		       enum transcoder cpu_transcoder, bool state);

#define assert_pipe_enabled(d, t) assert_pipe(d, t, true)

#define assert_pipe_disabled(d, t) assert_pipe(d, t, false)

#define assert_transcoder_enabled(d, t) assert_transcoder(d, t, true)

#define assert_transcoder_disabled(d, t) assert_transcoder(d, t, false)



/* Use I915_STATE_WARN(x) and I915_STATE_WARN_ON() (rather than WARN() and

 * WARN_ON()) for hw state sanity checks to check for unexpected conditions