Skip to content

Commit 4a4064a

Browse files
ideakjnikula
authored andcommitted
drm/i915/tgl: Make sure TC-cold is blocked before enabling TC AUX power wells
The dependency between power wells is determined by the ordering of the power well list: when enabling the power wells for a domain, this happens walking the power well list forward, while disabling them happens in the reverse direction. Accordingly a power well on the list must follow any other power well it depends on. Since the TC AUX power wells depend on TC-cold being blocked, move the TC-cold off power well before all AUX power wells. Fixes: 3c02934 ("drm/i915/tc/tgl: Implement TC cold sequences") Cc: José Roberto de Souza <[email protected]> Signed-off-by: Imre Deak <[email protected]> Reviewed-by: José Roberto de Souza <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Rodrigo Vivi <[email protected]> (cherry picked from commit b302a2e) Signed-off-by: Jani Nikula <[email protected]>
1 parent c43a87f commit 4a4064a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4146,6 +4146,12 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
41464146
.hsw.idx = TGL_PW_CTL_IDX_DDI_TC6,
41474147
},
41484148
},
4149+
{
4150+
.name = "TC cold off",
4151+
.domains = TGL_TC_COLD_OFF_POWER_DOMAINS,
4152+
.ops = &tgl_tc_cold_off_ops,
4153+
.id = DISP_PW_ID_NONE,
4154+
},
41494155
{
41504156
.name = "AUX A",
41514157
.domains = TGL_AUX_A_IO_POWER_DOMAINS,
@@ -4332,12 +4338,6 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
43324338
.hsw.irq_pipe_mask = BIT(PIPE_D),
43334339
},
43344340
},
4335-
{
4336-
.name = "TC cold off",
4337-
.domains = TGL_TC_COLD_OFF_POWER_DOMAINS,
4338-
.ops = &tgl_tc_cold_off_ops,
4339-
.id = DISP_PW_ID_NONE,
4340-
},
43414341
};
43424342

43434343
static const struct i915_power_well_desc rkl_power_wells[] = {

0 commit comments

Comments
 (0)