On Wed, Jan 3, 2018 at 11:17 PM, Evan Quan <evan.quan at amd.com> wrote: > V2: move the SMU7Thermal structure to newly created header file > > Change-Id: I569179443c73c793153d5c499dd2f203f89e3ca2 > Signed-off-by: Evan Quan <evan.quan at amd.com> > --- > drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 21 +++++++++++++++++++++ > drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h | 6 ++++++ > 2 files changed, 27 insertions(+) > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > index 8d7fd06..df25d91 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > @@ -48,6 +48,7 @@ > #include "smu7_thermal.h" > #include "smu7_clockpowergating.h" > #include "processpptables.h" > +#include "pp_thermal.h" > > #define MC_CG_ARB_FREQ_F0 0x0a > #define MC_CG_ARB_FREQ_F1 0x0b > @@ -4655,6 +4656,25 @@ static int smu7_notify_cac_buffer_info(struct pp_hwmgr *hwmgr, > return 0; > } > > +static int smu7_get_thermal_temperature_range(struct pp_hwmgr *hwmgr, > + struct PP_TemperatureRange *thermal_data) > +{ > + struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend); > + struct phm_ppt_v1_information *table_info = > + (struct phm_ppt_v1_information *)hwmgr->pptable; > + > + memcpy(thermal_data, &SMU7ThermalPolicy[0], sizeof(struct PP_TemperatureRange)); > + > + if (hwmgr->pp_table_version == PP_TABLE_V1) > + thermal_data->max = table_info->cac_dtp_table->usSoftwareShutdownTemp * > + PP_TEMPERATURE_UNITS_PER_CENTIGRADES; > + else if (hwmgr->pp_table_version == PP_TABLE_V0) > + thermal_data->max = data->thermal_temp_setting.temperature_shutdown * > + PP_TEMPERATURE_UNITS_PER_CENTIGRADES; > + > + return 0; > +} > + > static const struct pp_hwmgr_func smu7_hwmgr_funcs = { > .backend_init = &smu7_hwmgr_backend_init, > .backend_fini = &smu7_hwmgr_backend_fini, > @@ -4707,6 +4727,7 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = { > .disable_smc_firmware_ctf = smu7_thermal_disable_alert, > .start_thermal_controller = smu7_start_thermal_controller, > .notify_cac_buffer_info = smu7_notify_cac_buffer_info, > + .get_thermal_temperature_range = smu7_get_thermal_temperature_range, > }; > > uint8_t smu7_get_sleep_divider_id_from_clock(uint32_t clock, > diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h b/drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h > index 82b810a..201d2b6 100644 > --- a/drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h > +++ b/drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h > @@ -31,4 +31,10 @@ static const struct PP_TemperatureRange SMU7ThermalWithDelayPolicy[] = > { 120000, 120000}, > }; > > +static const struct PP_TemperatureRange SMU7ThermalPolicy[] = > +{ > + {-273150, 99000}, > + { 120000, 120000}, > +}; This is identical to the other temp range you added in patch 1. Alex > + > #endif > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx