From 9c0bad907413f5e3bea19d062beaab65b3dbf98f Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 13 Nov 2015 23:51:40 -0500 Subject: [PATCH] drm/amd/powerplay: implement smc state upload for CZ Signed-off-by: Alex Deucher --- .../gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 135 ++++++++++++++++-- .../gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h | 1 + .../drm/amd/powerplay/hwmgr/processpptables.c | 22 +-- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 5 +- 4 files changed, 141 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c index e187b3f1a903..fc567caa80d1 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c @@ -26,6 +26,7 @@ #include "atom-types.h" #include "atombios.h" #include "processpptables.h" +#include "pp_debug.h" #include "cgs_common.h" #include "smu/smu_8_0_d.h" #include "smu8_fusion.h" @@ -70,7 +71,7 @@ uint32_t cz_get_eclk_level(struct pp_hwmgr *hwmgr, { int i = 0; struct phm_vce_clock_voltage_dependency_table *ptable = - hwmgr->dyn_state.vce_clocl_voltage_dependency_table; + hwmgr->dyn_state.vce_clock_voltage_dependency_table; switch (msg) { case PPSMC_MSG_SetEclkSoftMin: @@ -131,7 +132,7 @@ static uint32_t cz_get_uvd_level(struct pp_hwmgr *hwmgr, { int i = 0; struct phm_uvd_clock_voltage_dependency_table *ptable = - hwmgr->dyn_state.uvd_clocl_voltage_dependency_table; + hwmgr->dyn_state.uvd_clock_voltage_dependency_table; switch (msg) { case PPSMC_MSG_SetUvdSoftMin: @@ -448,9 +449,123 @@ static int cz_tf_reset_active_process_mask(struct pp_hwmgr *hwmgr, void *input, } static int cz_tf_upload_pptable_to_smu(struct pp_hwmgr *hwmgr, void *input, - void *output, void *storage, int result) + void *output, void *storage, int result) { - return 0; + struct SMU8_Fusion_ClkTable *clock_table; + int ret; + uint32_t i; + void *table = NULL; + pp_atomctrl_clock_dividers_kong dividers; + + struct phm_clock_voltage_dependency_table *vddc_table = + hwmgr->dyn_state.vddc_dependency_on_sclk; + struct phm_clock_voltage_dependency_table *vdd_gfx_table = + hwmgr->dyn_state.vdd_gfx_dependency_on_sclk; + struct phm_acp_clock_voltage_dependency_table *acp_table = + hwmgr->dyn_state.acp_clock_voltage_dependency_table; + struct phm_uvd_clock_voltage_dependency_table *uvd_table = + hwmgr->dyn_state.uvd_clock_voltage_dependency_table; + struct phm_vce_clock_voltage_dependency_table *vce_table = + hwmgr->dyn_state.vce_clock_voltage_dependency_table; + + if (!hwmgr->need_pp_table_upload) + return 0; + + ret = smum_download_powerplay_table(hwmgr->smumgr, &table); + + PP_ASSERT_WITH_CODE((0 == ret && NULL != table), + "Fail to get clock table from SMU!", return -EINVAL;); + + clock_table = (struct SMU8_Fusion_ClkTable *)table; + + /* patch clock table */ + PP_ASSERT_WITH_CODE((vddc_table->count <= CZ_MAX_HARDWARE_POWERLEVELS), + "Dependency table entry exceeds max limit!", return -EINVAL;); + PP_ASSERT_WITH_CODE((vdd_gfx_table->count <= CZ_MAX_HARDWARE_POWERLEVELS), + "Dependency table entry exceeds max limit!", return -EINVAL;); + PP_ASSERT_WITH_CODE((acp_table->count <= CZ_MAX_HARDWARE_POWERLEVELS), + "Dependency table entry exceeds max limit!", return -EINVAL;); + PP_ASSERT_WITH_CODE((uvd_table->count <= CZ_MAX_HARDWARE_POWERLEVELS), + "Dependency table entry exceeds max limit!", return -EINVAL;); + PP_ASSERT_WITH_CODE((vce_table->count <= CZ_MAX_HARDWARE_POWERLEVELS), + "Dependency table entry exceeds max limit!", return -EINVAL;); + + for (i = 0; i < CZ_MAX_HARDWARE_POWERLEVELS; i++) { + + /* vddc_sclk */ + clock_table->SclkBreakdownTable.ClkLevel[i].GnbVid = + (i < vddc_table->count) ? (uint8_t)vddc_table->entries[i].v : 0; + clock_table->SclkBreakdownTable.ClkLevel[i].Frequency = + (i < vddc_table->count) ? vddc_table->entries[i].clk : 0; + + atomctrl_get_engine_pll_dividers_kong(hwmgr, + clock_table->SclkBreakdownTable.ClkLevel[i].Frequency, + ÷rs); + + clock_table->SclkBreakdownTable.ClkLevel[i].DfsDid = + (uint8_t)dividers.pll_post_divider; + + /* vddgfx_sclk */ + clock_table->SclkBreakdownTable.ClkLevel[i].GfxVid = + (i < vdd_gfx_table->count) ? (uint8_t)vdd_gfx_table->entries[i].v : 0; + + /* acp breakdown */ + clock_table->AclkBreakdownTable.ClkLevel[i].GfxVid = + (i < acp_table->count) ? (uint8_t)acp_table->entries[i].v : 0; + clock_table->AclkBreakdownTable.ClkLevel[i].Frequency = + (i < acp_table->count) ? acp_table->entries[i].acpclk : 0; + + atomctrl_get_engine_pll_dividers_kong(hwmgr, + clock_table->AclkBreakdownTable.ClkLevel[i].Frequency, + ÷rs); + + clock_table->AclkBreakdownTable.ClkLevel[i].DfsDid = + (uint8_t)dividers.pll_post_divider; + + + /* uvd breakdown */ + clock_table->VclkBreakdownTable.ClkLevel[i].GfxVid = + (i < uvd_table->count) ? (uint8_t)uvd_table->entries[i].v : 0; + clock_table->VclkBreakdownTable.ClkLevel[i].Frequency = + (i < uvd_table->count) ? uvd_table->entries[i].vclk : 0; + + atomctrl_get_engine_pll_dividers_kong(hwmgr, + clock_table->VclkBreakdownTable.ClkLevel[i].Frequency, + ÷rs); + + clock_table->VclkBreakdownTable.ClkLevel[i].DfsDid = + (uint8_t)dividers.pll_post_divider; + + clock_table->DclkBreakdownTable.ClkLevel[i].GfxVid = + (i < uvd_table->count) ? (uint8_t)uvd_table->entries[i].v : 0; + clock_table->DclkBreakdownTable.ClkLevel[i].Frequency = + (i < uvd_table->count) ? uvd_table->entries[i].dclk : 0; + + atomctrl_get_engine_pll_dividers_kong(hwmgr, + clock_table->DclkBreakdownTable.ClkLevel[i].Frequency, + ÷rs); + + clock_table->DclkBreakdownTable.ClkLevel[i].DfsDid = + (uint8_t)dividers.pll_post_divider; + + /* vce breakdown */ + clock_table->EclkBreakdownTable.ClkLevel[i].GfxVid = + (i < vce_table->count) ? (uint8_t)vce_table->entries[i].v : 0; + clock_table->EclkBreakdownTable.ClkLevel[i].Frequency = + (i < vce_table->count) ? vce_table->entries[i].ecclk : 0; + + + atomctrl_get_engine_pll_dividers_kong(hwmgr, + clock_table->EclkBreakdownTable.ClkLevel[i].Frequency, + ÷rs); + + clock_table->EclkBreakdownTable.ClkLevel[i].DfsDid = + (uint8_t)dividers.pll_post_divider; + + } + ret = smum_upload_powerplay_table(hwmgr->smumgr); + + return ret; } static int cz_tf_init_sclk_limit(struct pp_hwmgr *hwmgr, void *input, @@ -485,7 +600,7 @@ static int cz_tf_init_uvd_limit(struct pp_hwmgr *hwmgr, void *input, { struct cz_hwmgr *cz_hwmgr = (struct cz_hwmgr *)(hwmgr->backend); struct phm_uvd_clock_voltage_dependency_table *table = - hwmgr->dyn_state.uvd_clocl_voltage_dependency_table; + hwmgr->dyn_state.uvd_clock_voltage_dependency_table; unsigned long clock = 0, level; if (NULL == table && table->count <= 0) @@ -513,7 +628,7 @@ static int cz_tf_init_vce_limit(struct pp_hwmgr *hwmgr, void *input, { struct cz_hwmgr *cz_hwmgr = (struct cz_hwmgr *)(hwmgr->backend); struct phm_vce_clock_voltage_dependency_table *table = - hwmgr->dyn_state.vce_clocl_voltage_dependency_table; + hwmgr->dyn_state.vce_clock_voltage_dependency_table; unsigned long clock = 0, level; if (NULL == table && table->count <= 0) @@ -1144,7 +1259,7 @@ int cz_dpm_update_uvd_dpm(struct pp_hwmgr *hwmgr, bool bgate) { struct cz_hwmgr *cz_hwmgr = (struct cz_hwmgr *)(hwmgr->backend); struct phm_uvd_clock_voltage_dependency_table *ptable = - hwmgr->dyn_state.uvd_clocl_voltage_dependency_table; + hwmgr->dyn_state.uvd_clock_voltage_dependency_table; if (!bgate) { /* Stable Pstate is enabled and we need to set the UVD DPM to highest level */ @@ -1172,7 +1287,7 @@ int cz_dpm_update_vce_dpm(struct pp_hwmgr *hwmgr) { struct cz_hwmgr *cz_hwmgr = (struct cz_hwmgr *)(hwmgr->backend); struct phm_vce_clock_voltage_dependency_table *ptable = - hwmgr->dyn_state.vce_clocl_voltage_dependency_table; + hwmgr->dyn_state.vce_clock_voltage_dependency_table; /* Stable Pstate is enabled and we need to set the VCE DPM to highest level */ if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, @@ -1331,10 +1446,10 @@ cz_print_current_perforce_level(struct pp_hwmgr *hwmgr, struct seq_file *m) hwmgr->dyn_state.vddc_dependency_on_sclk; struct phm_vce_clock_voltage_dependency_table *vce_table = - hwmgr->dyn_state.vce_clocl_voltage_dependency_table; + hwmgr->dyn_state.vce_clock_voltage_dependency_table; struct phm_uvd_clock_voltage_dependency_table *uvd_table = - hwmgr->dyn_state.uvd_clocl_voltage_dependency_table; + hwmgr->dyn_state.uvd_clock_voltage_dependency_table; uint32_t sclk_index = PHM_GET_FIELD(cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixTARGET_AND_CURRENT_PROFILE_INDEX), TARGET_AND_CURRENT_PROFILE_INDEX, CURR_SCLK_INDEX); diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h index 70b0e51b7ee6..1765d0e02d47 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h @@ -25,6 +25,7 @@ #define _CZ_HWMGR_H_ #include "cgs_common.h" +#include "ppatomctrl.h" #define CZ_NUM_NBPSTATES 4 #define CZ_NUM_NBPMEMORYCLOCK 2 diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c index dc1d3d20aa5c..fdda6b4acb39 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c @@ -1163,8 +1163,8 @@ static int init_clock_voltage_dependency(struct pp_hwmgr *hwmgr, hwmgr->dyn_state.vddc_dependency_on_mclk = NULL; hwmgr->dyn_state.vddc_dep_on_dal_pwrl = NULL; hwmgr->dyn_state.mvdd_dependency_on_mclk = NULL; - hwmgr->dyn_state.vce_clocl_voltage_dependency_table = NULL; - hwmgr->dyn_state.uvd_clocl_voltage_dependency_table = NULL; + hwmgr->dyn_state.vce_clock_voltage_dependency_table = NULL; + hwmgr->dyn_state.uvd_clock_voltage_dependency_table = NULL; hwmgr->dyn_state.samu_clock_voltage_dependency_table = NULL; hwmgr->dyn_state.acp_clock_voltage_dependency_table = NULL; hwmgr->dyn_state.ppm_parameter_table = NULL; @@ -1182,7 +1182,7 @@ static int init_clock_voltage_dependency(struct pp_hwmgr *hwmgr, (const ATOM_PPLIB_VCE_Clock_Voltage_Limit_Table *) (((unsigned long) powerplay_table) + table_offset); result = get_vce_clock_voltage_limit_table(hwmgr, - &hwmgr->dyn_state.vce_clocl_voltage_dependency_table, + &hwmgr->dyn_state.vce_clock_voltage_dependency_table, table, array); } @@ -1197,7 +1197,7 @@ static int init_clock_voltage_dependency(struct pp_hwmgr *hwmgr, (const ATOM_PPLIB_UVD_Clock_Voltage_Limit_Table *) (((unsigned long) powerplay_table) + table_offset); result = get_uvd_clock_voltage_limit_table(hwmgr, - &hwmgr->dyn_state.uvd_clocl_voltage_dependency_table, ptable, array); + &hwmgr->dyn_state.uvd_clock_voltage_dependency_table, ptable, array); } table_offset = get_samu_clock_voltage_limit_table_offset(hwmgr, @@ -1533,6 +1533,8 @@ static int pp_tables_initialize(struct pp_hwmgr *hwmgr) int result; const ATOM_PPLIB_POWERPLAYTABLE *powerplay_table; + hwmgr->need_pp_table_upload = true; + powerplay_table = get_powerplay_table(hwmgr); result = init_powerplay_tables(hwmgr, powerplay_table); @@ -1607,14 +1609,14 @@ static int pp_tables_uninitialize(struct pp_hwmgr *hwmgr) hwmgr->dyn_state.vddc_phase_shed_limits_table = NULL; } - if (NULL != hwmgr->dyn_state.vce_clocl_voltage_dependency_table) { - kfree(hwmgr->dyn_state.vce_clocl_voltage_dependency_table); - hwmgr->dyn_state.vce_clocl_voltage_dependency_table = NULL; + if (NULL != hwmgr->dyn_state.vce_clock_voltage_dependency_table) { + kfree(hwmgr->dyn_state.vce_clock_voltage_dependency_table); + hwmgr->dyn_state.vce_clock_voltage_dependency_table = NULL; } - if (NULL != hwmgr->dyn_state.uvd_clocl_voltage_dependency_table) { - kfree(hwmgr->dyn_state.uvd_clocl_voltage_dependency_table); - hwmgr->dyn_state.uvd_clocl_voltage_dependency_table = NULL; + if (NULL != hwmgr->dyn_state.uvd_clock_voltage_dependency_table) { + kfree(hwmgr->dyn_state.uvd_clock_voltage_dependency_table); + hwmgr->dyn_state.uvd_clock_voltage_dependency_table = NULL; } if (NULL != hwmgr->dyn_state.samu_clock_voltage_dependency_table) { diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h index 5b5c94dc3510..e115a071b5d0 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h @@ -463,9 +463,9 @@ struct phm_dynamic_state_info { struct phm_phase_shedding_limits_table *vddc_phase_shed_limits_table; struct phm_vce_clock_voltage_dependency_table - *vce_clocl_voltage_dependency_table; + *vce_clock_voltage_dependency_table; struct phm_uvd_clock_voltage_dependency_table - *uvd_clocl_voltage_dependency_table; + *uvd_clock_voltage_dependency_table; struct phm_acp_clock_voltage_dependency_table *acp_clock_voltage_dependency_table; struct phm_samu_clock_voltage_dependency_table @@ -551,6 +551,7 @@ struct pp_hwmgr { void *device; struct pp_smumgr *smumgr; const void *soft_pp_table; + bool need_pp_table_upload; enum amd_dpm_forced_level dpm_level; bool block_hw_access; struct phm_gfx_arbiter gfx_arbiter; -- 2.20.1