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

Commit 89f57523 authored by Imre Deak's avatar Imre Deak Committed by Jani Nikula
Browse files

drm/i915: Fix the TBT AUX power well enabling 



Fix the mapping from a TBT AUX power well index to the DP_AUX_CH_CTL
register.

Fixes: c7375d95 ("drm/i915: Configure AUX_CH_CTL when enabling the AUX power domain")
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190628143635.22066-7-imre.deak@intel.com


(cherry picked from commit 29ae36ab)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 0bbfdce3

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

+9 −2
Original line number Diff line number Diff line
@@ -438,16 +438,23 @@ icl_combo_phy_aux_power_well_disable(struct drm_i915_private *dev_priv, 
#define ICL_AUX_PW_TO_CH(pw_idx)	\

	((pw_idx) - ICL_PW_CTL_IDX_AUX_A + AUX_CH_A)



#define ICL_TBT_AUX_PW_TO_CH(pw_idx)	\

	((pw_idx) - ICL_PW_CTL_IDX_AUX_TBT1 + AUX_CH_C)



static void

icl_tc_phy_aux_power_well_enable(struct drm_i915_private *dev_priv,

				 struct i915_power_well *power_well)

{

	enum aux_ch aux_ch = ICL_AUX_PW_TO_CH(power_well->desc->hsw.idx);

	int pw_idx = power_well->desc->hsw.idx;

	bool is_tbt = power_well->desc->hsw.is_tc_tbt;

	enum aux_ch aux_ch;

	u32 val;



	aux_ch = is_tbt ? ICL_TBT_AUX_PW_TO_CH(pw_idx) :

			  ICL_AUX_PW_TO_CH(pw_idx);

	val = I915_READ(DP_AUX_CH_CTL(aux_ch));

	val &= ~DP_AUX_CH_CTL_TBT_IO;

	if (power_well->desc->hsw.is_tc_tbt)

	if (is_tbt)

		val |= DP_AUX_CH_CTL_TBT_IO;

	I915_WRITE(DP_AUX_CH_CTL(aux_ch), val);