drm/amd/powerplay: sw ctf for arcturus
authorKenneth Feng <kenneth.feng@amd.com>
Thu, 9 Jan 2020 07:01:41 +0000 (15:01 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 14 Jan 2020 15:18:09 +0000 (10:18 -0500)
change the sw ctf setting to smu_v11_0_set_thermal_range()
since software_shutdown_temp shares the same definition and
name in all the smu11 project.

Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/smu_v11_0.c

index e804f98..76bddd5 100644 (file)
@@ -1154,11 +1154,12 @@ static int smu_v11_0_set_thermal_range(struct smu_context *smu,
        int low = SMU_THERMAL_MINIMUM_ALERT_TEMP;
        int high = SMU_THERMAL_MAXIMUM_ALERT_TEMP;
        uint32_t val;
+       struct smu_table_context *table_context = &smu->smu_table;
+       struct smu_11_0_powerplay_table *powerplay_table = table_context->power_play_table;
 
        low = max(SMU_THERMAL_MINIMUM_ALERT_TEMP,
                        range.min / SMU_TEMPERATURE_UNITS_PER_CENTIGRADES);
-       high = min(SMU_THERMAL_MAXIMUM_ALERT_TEMP,
-                       range.max / SMU_TEMPERATURE_UNITS_PER_CENTIGRADES);
+       high = min(SMU_THERMAL_MAXIMUM_ALERT_TEMP, powerplay_table->software_shutdown_temp);
 
        if (low > high)
                return -EINVAL;