Commit e20b77c1 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Remove the ICL specific TBT power domains 



The spec calls the ICL TBT AUX power well instances TBT1-4 (similarly to
all later platforms), align the power domain names with the spec.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220414210657.1785773-16-imre.deak@intel.com
parent c97bbab0

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

+1 −9
Original line number Diff line number Diff line
@@ -166,14 +166,6 @@ intel_display_power_domain_str(enum intel_display_power_domain domain) 
		return "AUX_E_XELPD";

	case POWER_DOMAIN_AUX_IO_A:

		return "AUX_IO_A";

	case POWER_DOMAIN_AUX_TBT_C:

		return "AUX_TBT_C";

	case POWER_DOMAIN_AUX_TBT_D:

		return "AUX_TBT_D";

	case POWER_DOMAIN_AUX_TBT_E:

		return "AUX_TBT_E";

	case POWER_DOMAIN_AUX_TBT_F:

		return "AUX_TBT_F";

	case POWER_DOMAIN_AUX_TBT1:

		return "AUX_TBT1";

	case POWER_DOMAIN_AUX_TBT2:
@@ -2341,7 +2333,7 @@ d11_port_domains[] = { 
		.ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_C,

		.ddi_io = POWER_DOMAIN_PORT_DDI_IO_C,

		.aux_legacy_usbc = POWER_DOMAIN_AUX_C,

		.aux_tbt = POWER_DOMAIN_AUX_TBT_C,

		.aux_tbt = POWER_DOMAIN_AUX_TBT1,

	},

};

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

+0 −4
Original line number Diff line number Diff line
@@ -100,10 +100,6 @@ enum intel_display_power_domain { 
	POWER_DOMAIN_AUX_E_XELPD,



	POWER_DOMAIN_AUX_IO_A,

	POWER_DOMAIN_AUX_TBT_C,

	POWER_DOMAIN_AUX_TBT_D,

	POWER_DOMAIN_AUX_TBT_E,

	POWER_DOMAIN_AUX_TBT_F,



	POWER_DOMAIN_AUX_TBT1,

	POWER_DOMAIN_AUX_TBT2,

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

+8 −8
Original line number Diff line number Diff line
@@ -622,10 +622,10 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_pw_4, 
	POWER_DOMAIN_AUX_D, \

	POWER_DOMAIN_AUX_E, \

	POWER_DOMAIN_AUX_F, \

	POWER_DOMAIN_AUX_TBT_C, \

	POWER_DOMAIN_AUX_TBT_D, \

	POWER_DOMAIN_AUX_TBT_E, \

	POWER_DOMAIN_AUX_TBT_F

	POWER_DOMAIN_AUX_TBT1, \

	POWER_DOMAIN_AUX_TBT2, \

	POWER_DOMAIN_AUX_TBT3, \

	POWER_DOMAIN_AUX_TBT4



I915_DECL_PW_DOMAINS(icl_pwdoms_pw_3,

	ICL_PW_3_POWER_DOMAINS,
@@ -668,10 +668,10 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_aux_c, POWER_DOMAIN_AUX_C); 
I915_DECL_PW_DOMAINS(icl_pwdoms_aux_d,		POWER_DOMAIN_AUX_D);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_e,		POWER_DOMAIN_AUX_E);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_f,		POWER_DOMAIN_AUX_F);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt1,	POWER_DOMAIN_AUX_TBT_C);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt2,	POWER_DOMAIN_AUX_TBT_D);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt3,	POWER_DOMAIN_AUX_TBT_E);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt4,	POWER_DOMAIN_AUX_TBT_F);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt1,	POWER_DOMAIN_AUX_TBT1);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt2,	POWER_DOMAIN_AUX_TBT2);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt3,	POWER_DOMAIN_AUX_TBT3);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt4,	POWER_DOMAIN_AUX_TBT4);



static const struct i915_power_well_desc icl_power_wells_pw_1[] = {

	{