Commit 5c30cfcd authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Move the POWER_DOMAIN_AUX_IO_A definition to its logical place 



Move the definition of the AUX_IO_A power domain, requiring only the
corresponding AUX_IO_A power well to be enabled, before all the
AUX_<port> power domains, which require both the AUX_IO_<port> and the
DC_OFF power wells to be enabled.

No functional change.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221114122251.21327-4-imre.deak@intel.com
parent 7ed31002

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

+2 −2
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ intel_display_power_domain_str(enum intel_display_power_domain domain) 
		return "AUDIO_MMIO";

	case POWER_DOMAIN_AUDIO_PLAYBACK:

		return "AUDIO_PLAYBACK";

	case POWER_DOMAIN_AUX_IO_A:

		return "AUX_IO_A";

	case POWER_DOMAIN_AUX_A:

		return "AUX_A";

	case POWER_DOMAIN_AUX_B:
@@ -153,8 +155,6 @@ intel_display_power_domain_str(enum intel_display_power_domain domain) 
		return "AUX_USBC5";

	case POWER_DOMAIN_AUX_USBC6:

		return "AUX_USBC6";

	case POWER_DOMAIN_AUX_IO_A:

		return "AUX_IO_A";

	case POWER_DOMAIN_AUX_TBT1:

		return "AUX_TBT1";

	case POWER_DOMAIN_AUX_TBT2:

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

+3 −2
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ enum intel_display_power_domain { 
	POWER_DOMAIN_VGA,

	POWER_DOMAIN_AUDIO_MMIO,

	POWER_DOMAIN_AUDIO_PLAYBACK,



	POWER_DOMAIN_AUX_IO_A,



	POWER_DOMAIN_AUX_A,

	POWER_DOMAIN_AUX_B,

	POWER_DOMAIN_AUX_C,
@@ -91,8 +94,6 @@ enum intel_display_power_domain { 
	POWER_DOMAIN_AUX_USBC5,

	POWER_DOMAIN_AUX_USBC6,



	POWER_DOMAIN_AUX_IO_A,



	POWER_DOMAIN_AUX_TBT1,

	POWER_DOMAIN_AUX_TBT2,

	POWER_DOMAIN_AUX_TBT3,

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

+3 −3
Original line number Diff line number Diff line
@@ -518,8 +518,8 @@ I915_DECL_PW_DOMAINS(glk_pwdoms_dpio_cmn_c, 
	POWER_DOMAIN_INIT);



I915_DECL_PW_DOMAINS(glk_pwdoms_aux_a,

	POWER_DOMAIN_AUX_A,

	POWER_DOMAIN_AUX_IO_A,

	POWER_DOMAIN_AUX_A,

	POWER_DOMAIN_INIT);



I915_DECL_PW_DOMAINS(glk_pwdoms_aux_b,
@@ -658,8 +658,8 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_ddi_io_e, POWER_DOMAIN_PORT_DDI_IO_E); 
I915_DECL_PW_DOMAINS(icl_pwdoms_ddi_io_f,	POWER_DOMAIN_PORT_DDI_IO_F);



I915_DECL_PW_DOMAINS(icl_pwdoms_aux_a,

	POWER_DOMAIN_AUX_A,

	POWER_DOMAIN_AUX_IO_A);

	POWER_DOMAIN_AUX_IO_A,

	POWER_DOMAIN_AUX_A);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_b,		POWER_DOMAIN_AUX_B);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_c,		POWER_DOMAIN_AUX_C);

I915_DECL_PW_DOMAINS(icl_pwdoms_aux_d,		POWER_DOMAIN_AUX_D);