Skip to content

Commit a6b4229

Browse files
ideaktursulin
authored andcommitted
drm/i915/adlp+: Allow DC states along with PW2 only for PWB functionality
A recent bspec update added a restriction on when DC states can be enabled: [Before enabling DC states:] """ PG2 can be kept enabled only because PGB requires PG2. Do not use PG2 functions, such as type-C DDIs. DMC will dynamically control PG1, PGA, PG2, PGB. """ Accordingly prevent DC states if PW2 (aka PG2) is enabled for any other functionality. Bpsec: 49193 Fixes: 88c4879 ("drm/i915: Use separate "DC off" power well for ADL-P and DG2") Reported-by: Kai Vehmanen <[email protected]> Tested-by: Ambica Pramod <[email protected]> Reviewed-by: Uma Shankar <[email protected]> Signed-off-by: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit f4e498e) Signed-off-by: Tvrtko Ursulin <[email protected]>
1 parent 274d4b9 commit a6b4229

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,10 +1252,18 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a,
12521252
POWER_DOMAIN_INIT);
12531253

12541254
#define XELPD_DC_OFF_PORT_POWER_DOMAINS \
1255+
POWER_DOMAIN_PORT_DDI_LANES_C, \
1256+
POWER_DOMAIN_PORT_DDI_LANES_D, \
1257+
POWER_DOMAIN_PORT_DDI_LANES_E, \
12551258
POWER_DOMAIN_PORT_DDI_LANES_TC1, \
12561259
POWER_DOMAIN_PORT_DDI_LANES_TC2, \
12571260
POWER_DOMAIN_PORT_DDI_LANES_TC3, \
12581261
POWER_DOMAIN_PORT_DDI_LANES_TC4, \
1262+
POWER_DOMAIN_VGA, \
1263+
POWER_DOMAIN_AUDIO_PLAYBACK, \
1264+
POWER_DOMAIN_AUX_IO_C, \
1265+
POWER_DOMAIN_AUX_IO_D, \
1266+
POWER_DOMAIN_AUX_IO_E, \
12591267
POWER_DOMAIN_AUX_C, \
12601268
POWER_DOMAIN_AUX_D, \
12611269
POWER_DOMAIN_AUX_E, \
@@ -1272,14 +1280,6 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a,
12721280
XELPD_PW_B_POWER_DOMAINS, \
12731281
XELPD_PW_C_POWER_DOMAINS, \
12741282
XELPD_PW_D_POWER_DOMAINS, \
1275-
POWER_DOMAIN_PORT_DDI_LANES_C, \
1276-
POWER_DOMAIN_PORT_DDI_LANES_D, \
1277-
POWER_DOMAIN_PORT_DDI_LANES_E, \
1278-
POWER_DOMAIN_VGA, \
1279-
POWER_DOMAIN_AUDIO_PLAYBACK, \
1280-
POWER_DOMAIN_AUX_IO_C, \
1281-
POWER_DOMAIN_AUX_IO_D, \
1282-
POWER_DOMAIN_AUX_IO_E, \
12831283
XELPD_DC_OFF_PORT_POWER_DOMAINS
12841284

12851285
I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_2,

0 commit comments

Comments
 (0)