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

drm/i915: s/gmch_{m,n}/data_{m,n}/ 



Rename the gmch_* M/N members to data_* to match the register
definitions and thus make life a little less confusing.

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


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

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

+2 −2
Original line number Diff line number Diff line
@@ -3684,8 +3684,8 @@ static bool m_n_equal(const struct intel_link_m_n *m_n_1, 
		      const struct intel_link_m_n *m_n_2)

{

	return m_n_1->tu == m_n_2->tu &&

		m_n_1->gmch_m == m_n_2->gmch_m &&

		m_n_1->gmch_n == m_n_2->gmch_n &&

		m_n_1->data_m == m_n_2->data_m &&

		m_n_1->data_n == m_n_2->data_n &&

		m_n_1->link_m == m_n_2->link_m &&

		m_n_1->link_n == m_n_2->link_n;

}

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

+24 −24
Original line number Diff line number Diff line
@@ -3082,7 +3082,7 @@ intel_link_compute_m_n(u16 bits_per_pixel, int nlanes, 
	m_n->tu = 64;

	compute_m_n(data_clock,

		    link_clock * nlanes * 8,

		    &m_n->gmch_m, &m_n->gmch_n,

		    &m_n->data_m, &m_n->data_n,

		    constant_n);



	compute_m_n(pixel_clock, link_clock,
@@ -3118,8 +3118,8 @@ static void intel_set_m_n(struct drm_i915_private *i915, 
			  i915_reg_t data_m_reg, i915_reg_t data_n_reg,

			  i915_reg_t link_m_reg, i915_reg_t link_n_reg)

{

	intel_de_write(i915, data_m_reg, TU_SIZE(m_n->tu) | m_n->gmch_m);

	intel_de_write(i915, data_n_reg, m_n->gmch_n);

	intel_de_write(i915, data_m_reg, TU_SIZE(m_n->tu) | m_n->data_m);

	intel_de_write(i915, data_n_reg, m_n->data_n);

	intel_de_write(i915, link_m_reg, m_n->link_m);

	intel_de_write(i915, link_n_reg, m_n->link_n);

}
@@ -3867,8 +3867,8 @@ static void intel_get_m_n(struct drm_i915_private *i915, 
{

	m_n->link_m = intel_de_read(i915, link_m_reg) & DATA_LINK_M_N_MASK;

	m_n->link_n = intel_de_read(i915, link_n_reg) & DATA_LINK_M_N_MASK;

	m_n->gmch_m = intel_de_read(i915, data_m_reg) & DATA_LINK_M_N_MASK;

	m_n->gmch_n = intel_de_read(i915, data_n_reg) & DATA_LINK_M_N_MASK;

	m_n->data_m = intel_de_read(i915, data_m_reg) & DATA_LINK_M_N_MASK;

	m_n->data_n = intel_de_read(i915, data_n_reg) & DATA_LINK_M_N_MASK;

	m_n->tu = REG_FIELD_GET(TU_SIZE_MASK, intel_de_read(i915, data_m_reg)) + 1;

}
@@ -5498,9 +5498,9 @@ intel_dump_m_n_config(const struct intel_crtc_state *pipe_config, 
	struct drm_i915_private *i915 = to_i915(pipe_config->uapi.crtc->dev);



	drm_dbg_kms(&i915->drm,

		    "%s: lanes: %i; gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n",

		    "%s: lanes: %i; data_m: %u, data_n: %u, link_m: %u, link_n: %u, tu: %u\n",

		    id, lane_count,

		    m_n->gmch_m, m_n->gmch_n,

		    m_n->data_m, m_n->data_n,

		    m_n->link_m, m_n->link_n, m_n->tu);

}
@@ -6196,8 +6196,8 @@ intel_compare_link_m_n(const struct intel_link_m_n *m_n, 
		       bool exact)

{

	return m_n->tu == m2_n2->tu &&

		intel_compare_m_n(m_n->gmch_m, m_n->gmch_n,

				  m2_n2->gmch_m, m2_n2->gmch_n, exact) &&

		intel_compare_m_n(m_n->data_m, m_n->data_n,

				  m2_n2->data_m, m2_n2->data_n, exact) &&

		intel_compare_m_n(m_n->link_m, m_n->link_n,

				  m2_n2->link_m, m2_n2->link_n, exact);

}
@@ -6396,16 +6396,16 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
				    &pipe_config->name,\

				    !fastset)) { \

		pipe_config_mismatch(fastset, crtc, __stringify(name), \

				     "(expected tu %i gmch %i/%i link %i/%i, " \

				     "found tu %i, gmch %i/%i link %i/%i)", \

				     "(expected tu %i data %i/%i link %i/%i, " \

				     "found tu %i, data %i/%i link %i/%i)", \

				     current_config->name.tu, \

				     current_config->name.gmch_m, \

				     current_config->name.gmch_n, \

				     current_config->name.data_m, \

				     current_config->name.data_n, \

				     current_config->name.link_m, \

				     current_config->name.link_n, \

				     pipe_config->name.tu, \

				     pipe_config->name.gmch_m, \

				     pipe_config->name.gmch_n, \

				     pipe_config->name.data_m, \

				     pipe_config->name.data_n, \

				     pipe_config->name.link_m, \

				     pipe_config->name.link_n); \

		ret = false; \
@@ -6423,22 +6423,22 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	    !intel_compare_link_m_n(&current_config->alt_name, \

				    &pipe_config->name, !fastset)) { \

		pipe_config_mismatch(fastset, crtc, __stringify(name), \

				     "(expected tu %i gmch %i/%i link %i/%i, " \

				     "or tu %i gmch %i/%i link %i/%i, " \

				     "found tu %i, gmch %i/%i link %i/%i)", \

				     "(expected tu %i data %i/%i link %i/%i, " \

				     "or tu %i data %i/%i link %i/%i, " \

				     "found tu %i, data %i/%i link %i/%i)", \

				     current_config->name.tu, \

				     current_config->name.gmch_m, \

				     current_config->name.gmch_n, \

				     current_config->name.data_m, \

				     current_config->name.data_n, \

				     current_config->name.link_m, \

				     current_config->name.link_n, \

				     current_config->alt_name.tu, \

				     current_config->alt_name.gmch_m, \

				     current_config->alt_name.gmch_n, \

				     current_config->alt_name.data_m, \

				     current_config->alt_name.data_n, \

				     current_config->alt_name.link_m, \

				     current_config->alt_name.link_n, \

				     pipe_config->name.tu, \

				     pipe_config->name.gmch_m, \

				     pipe_config->name.gmch_n, \

				     pipe_config->name.data_m, \

				     pipe_config->name.data_n, \

				     pipe_config->name.link_m, \

				     pipe_config->name.link_n); \

		ret = false; \

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

+2 −2
Original line number Diff line number Diff line
@@ -317,8 +317,8 @@ enum aux_ch { 
/* Used by dp and fdi links */

struct intel_link_m_n {

	u32 tu;

	u32 gmch_m;

	u32 gmch_n;

	u32 data_m;

	u32 data_n;

	u32 link_m;

	u32 link_n;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -1895,7 +1895,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, 


	/* FIXME: abstract this better */

	if (pipe_config->splitter.enable)

		pipe_config->dp_m_n.gmch_m *= pipe_config->splitter.link_count;

		pipe_config->dp_m_n.data_m *= pipe_config->splitter.link_count;



	if (!HAS_DDI(dev_priv))

		g4x_dp_set_clock(encoder, pipe_config);

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

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ intel_drrs_compute_config(struct intel_dp *intel_dp, 


	/* FIXME: abstract this better */

	if (pipe_config->splitter.enable)

		pipe_config->dp_m2_n2.gmch_m *= pipe_config->splitter.link_count;

		pipe_config->dp_m2_n2.data_m *= pipe_config->splitter.link_count;

}



static void intel_drrs_set_state(struct drm_i915_private *dev_priv,