Commit e713b26e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/ddi: simplify intel_ddi_get_encoder_pipes() slightly 



Use a temporary variable for DDI mode to simplify the conditions. This
is in line with the other places that read DDI mode.

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


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

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

+5 −4
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, 
	mst_pipe_mask = 0;

	for_each_pipe(dev_priv, p) {

		enum transcoder cpu_transcoder = (enum transcoder)p;

		unsigned int port_mask, ddi_select;

		u32 port_mask, ddi_select, ddi_mode;

		intel_wakeref_t trans_wakeref;



		trans_wakeref = intel_display_power_get_if_enabled(dev_priv,
@@ -842,9 +842,10 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, 
		if ((tmp & port_mask) != ddi_select)

			continue;



		if ((tmp & TRANS_DDI_MODE_SELECT_MASK) == TRANS_DDI_MODE_SELECT_DP_MST ||

		    (HAS_DP20(display) &&

		     (tmp & TRANS_DDI_MODE_SELECT_MASK) == TRANS_DDI_MODE_SELECT_FDI_OR_128B132B))

		ddi_mode = tmp & TRANS_DDI_MODE_SELECT_MASK;



		if (ddi_mode == TRANS_DDI_MODE_SELECT_DP_MST ||

		    (ddi_mode == TRANS_DDI_MODE_SELECT_FDI_OR_128B132B && HAS_DP20(display)))

			mst_pipe_mask |= BIT(p);



		*pipe_mask |= BIT(p);