Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/powerplay: maximum the code sharing on thermal irq setting

Put the common code in smu_v11_0.c instead of having one copy each.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Evan Quan and committed by
Alex Deucher
1e1964b7 0540eced

+12 -4
+12 -4
drivers/gpu/drm/amd/powerplay/smu_v11_0.c
··· 1091 1091 struct amdgpu_device *adev = smu->adev; 1092 1092 1093 1093 if (smu->smu_table.thermal_controller_type) { 1094 - ret = smu_set_thermal_range(smu, smu->thermal_range); 1095 - if (ret) 1096 - return ret; 1097 - 1098 1094 ret = amdgpu_irq_get(adev, &smu->irq_source, 0); 1099 1095 if (ret) 1100 1096 return ret; ··· 1345 1349 unsigned tyep, 1346 1350 enum amdgpu_interrupt_state state) 1347 1351 { 1352 + struct smu_context *smu = &adev->smu; 1353 + uint32_t low, high; 1348 1354 uint32_t val = 0; 1349 1355 1350 1356 switch (state) { ··· 1367 1369 break; 1368 1370 case AMDGPU_IRQ_STATE_ENABLE: 1369 1371 /* For THM irqs */ 1372 + low = max(SMU_THERMAL_MINIMUM_ALERT_TEMP, 1373 + smu->thermal_range.min / SMU_TEMPERATURE_UNITS_PER_CENTIGRADES); 1374 + high = min(SMU_THERMAL_MAXIMUM_ALERT_TEMP, 1375 + smu->thermal_range.software_shutdown_temp); 1376 + 1370 1377 val = RREG32_SOC15(THM, 0, mmTHM_THERMAL_INT_CTRL); 1378 + val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, MAX_IH_CREDIT, 5); 1379 + val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, THERM_IH_HW_ENA, 1); 1371 1380 val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, THERM_INTH_MASK, 0); 1372 1381 val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, THERM_INTL_MASK, 0); 1382 + val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, DIG_THERM_INTH, (high & 0xff)); 1383 + val = REG_SET_FIELD(val, THM_THERMAL_INT_CTRL, DIG_THERM_INTL, (low & 0xff)); 1384 + val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK); 1373 1385 WREG32_SOC15(THM, 0, mmTHM_THERMAL_INT_CTRL, val); 1374 1386 1375 1387 val = (1 << THM_THERMAL_INT_ENA__THERM_INTH_CLR__SHIFT);