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

drm/i915: Nuke ilk_get_fdi_m_n_config() 



Get rid of the entirely pointless ilk_get_fdi_m_n_config() wrapper
and just call the CPU transcoder function directly.

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


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

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

+0 −7
Original line number Diff line number Diff line
@@ -3893,13 +3893,6 @@ void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc, 
	}

}



void ilk_get_fdi_m_n_config(struct intel_crtc *crtc,

			    struct intel_crtc_state *pipe_config)

{

	intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,

				     &pipe_config->fdi_m_n, NULL);

}



static void ilk_get_pfit_pos_size(struct intel_crtc_state *crtc_state,

				  u32 pos, u32 size)

{

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

+0 −2
Original line number Diff line number Diff line
@@ -613,8 +613,6 @@ void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc, 
				  struct intel_link_m_n *m2_n2);

void intel_pch_transcoder_get_m_n(struct intel_crtc *crtc,

				  struct intel_link_m_n *m_n);

void ilk_get_fdi_m_n_config(struct intel_crtc *crtc,

			    struct intel_crtc_state *pipe_config);

void i9xx_crtc_clock_get(struct intel_crtc *crtc,

			 struct intel_crtc_state *pipe_config);

int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n);

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

+4 −2
Original line number Diff line number Diff line
@@ -386,7 +386,8 @@ void ilk_pch_get_config(struct intel_crtc_state *crtc_state) 
	crtc_state->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>

				 FDI_DP_PORT_WIDTH_SHIFT) + 1;



	ilk_get_fdi_m_n_config(crtc, crtc_state);

	intel_cpu_transcoder_get_m_n(crtc, crtc_state->cpu_transcoder,

				     &crtc_state->fdi_m_n, NULL);



	if (HAS_PCH_IBX(dev_priv)) {

		/*
@@ -509,7 +510,8 @@ void lpt_pch_get_config(struct intel_crtc_state *crtc_state) 
	crtc_state->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>

				 FDI_DP_PORT_WIDTH_SHIFT) + 1;



	ilk_get_fdi_m_n_config(crtc, crtc_state);

	intel_cpu_transcoder_get_m_n(crtc, crtc_state->cpu_transcoder,

				     &crtc_state->fdi_m_n, NULL);



	crtc_state->hw.adjusted_mode.crtc_clock = lpt_get_iclkip(dev_priv);

}