Skip to content

Commit cfc7d83

Browse files
Evan Quanalexdeucher
authored andcommitted
drm/amd/pm: fulfill the missing enablement for vega12/vega20 L2H and H2L interrupts
The feature mask bit was not correctly cleared. Without that, the L2H and H2L interrupts cannot be enabled. Signed-off-by: Evan Quan <evan.quan@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 2aafcdd commit cfc7d83

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_thermal.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ static int vega12_thermal_set_temperature_range(struct pp_hwmgr *hwmgr,
192192
val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, THERM_IH_HW_ENA, 1);
193193
val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, DIG_THERM_INTH, high);
194194
val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, DIG_THERM_INTL, low);
195-
val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK);
195+
val &= ~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK;
196+
val &= ~THM_THERMAL_INT_CTRL__THERM_INTH_MASK_MASK;
197+
val &= ~THM_THERMAL_INT_CTRL__THERM_INTL_MASK_MASK;
196198

197199
WREG32_SOC15(THM, 0, mmTHM_THERMAL_INT_CTRL, val);
198200

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,9 @@ static int vega20_thermal_set_temperature_range(struct pp_hwmgr *hwmgr,
263263
val = CGS_REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, THERM_IH_HW_ENA, 1);
264264
val = CGS_REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, DIG_THERM_INTH, high);
265265
val = CGS_REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, DIG_THERM_INTL, low);
266-
val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK);
266+
val &= ~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK;
267+
val &= ~THM_THERMAL_INT_CTRL__THERM_INTH_MASK_MASK;
268+
val &= ~THM_THERMAL_INT_CTRL__THERM_INTL_MASK_MASK;
267269

268270
WREG32_SOC15(THM, 0, mmTHM_THERMAL_INT_CTRL, val);
269271

0 commit comments

Comments
 (0)