Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37fc7845 authored by José Roberto de Souza's avatar José Roberto de Souza Committed by Jani Nikula
Browse files

drm/i915: Call MG_DP_MODE() macro with the right parameters order 



The commit that this patch fixes changed the order of the parameters
of MG_DP_MODE() but din't update the callers, breaking type-c on ICL.

Fixes: 58106b7d ("drm/i915: Make MG PHY macros semantically consistent")
Cc: Clint Taylor <clinton.a.taylor@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Aditya Swarup <aditya.swarup@intel.com>
Cc: Manasi navare <manasi.d.navare@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190222202437.6575-1-jose.souza@intel.com
parent d0aa694b

drivers/gpu/drm/i915/intel_ddi.c

+5 −5
Original line number Diff line number Diff line
@@ -2928,7 +2928,7 @@ static void icl_enable_phy_clock_gating(struct intel_digital_port *dig_port) 
	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);

	enum port port = dig_port->base.port;

	enum tc_port tc_port = intel_port_to_tc(dev_priv, port);

	i915_reg_t mg_regs[2] = { MG_DP_MODE(port, 0), MG_DP_MODE(port, 1) };

	i915_reg_t mg_regs[2] = { MG_DP_MODE(0, port), MG_DP_MODE(1, port) };

	u32 val;

	int i;
@@ -2999,8 +2999,8 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port) 
	if (tc_port == PORT_TC_NONE || intel_dig_port->tc_type == TC_PORT_TBT)

		return;



	ln0 = I915_READ(MG_DP_MODE(port, 0));

	ln1 = I915_READ(MG_DP_MODE(port, 1));

	ln0 = I915_READ(MG_DP_MODE(0, port));

	ln1 = I915_READ(MG_DP_MODE(1, port));



	switch (intel_dig_port->tc_type) {

	case TC_PORT_TYPEC:
@@ -3050,8 +3050,8 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port) 
		return;

	}



	I915_WRITE(MG_DP_MODE(port, 0), ln0);

	I915_WRITE(MG_DP_MODE(port, 1), ln1);

	I915_WRITE(MG_DP_MODE(0, port), ln0);

	I915_WRITE(MG_DP_MODE(1, port), ln1);

}



static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp,