drm/amd/powerplay: add power profile support for Fiji

Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
Acked-by: Rex Zhu <Rex.Zhu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
index 0f7a77b7312eb19f46a0cc47504c56df1fdd4674..62c41c4fc2e56de890ece1f6f20e4edea6be34e4 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
@@ -1721,6 +1721,43 @@ static int fiji_init_arb_table_index(struct pp_smumgr *smumgr)
                        smu_data->smu7_data.arb_table_start,  tmp, SMC_RAM_END);
 }
 
+static int fiji_save_default_power_profile(struct pp_hwmgr *hwmgr)
+{
+       struct fiji_smumgr *data = (struct fiji_smumgr *)(hwmgr->smumgr->backend);
+       struct SMU73_Discrete_GraphicsLevel *levels =
+                               data->smc_state_table.GraphicsLevel;
+       unsigned min_level = 1;
+
+       hwmgr->default_gfx_power_profile.activity_threshold =
+                       be16_to_cpu(levels[0].ActivityLevel);
+       hwmgr->default_gfx_power_profile.up_hyst = levels[0].UpHyst;
+       hwmgr->default_gfx_power_profile.down_hyst = levels[0].DownHyst;
+       hwmgr->default_gfx_power_profile.type = AMD_PP_GFX_PROFILE;
+
+       hwmgr->default_compute_power_profile = hwmgr->default_gfx_power_profile;
+       hwmgr->default_compute_power_profile.type = AMD_PP_COMPUTE_PROFILE;
+
+       /* Workaround compute SDMA instability: disable lowest SCLK
+        * DPM level. Optimize compute power profile: Use only highest
+        * 2 power levels (if more than 2 are available), Hysteresis:
+        * 0ms up, 5ms down
+        */
+       if (data->smc_state_table.GraphicsDpmLevelCount > 2)
+               min_level = data->smc_state_table.GraphicsDpmLevelCount - 2;
+       else if (data->smc_state_table.GraphicsDpmLevelCount == 2)
+               min_level = 1;
+       else
+               min_level = 0;
+       hwmgr->default_compute_power_profile.min_sclk =
+                       be32_to_cpu(levels[min_level].SclkFrequency);
+       hwmgr->default_compute_power_profile.up_hyst = 0;
+       hwmgr->default_compute_power_profile.down_hyst = 5;
+
+       hwmgr->gfx_power_profile = hwmgr->default_gfx_power_profile;
+       hwmgr->compute_power_profile = hwmgr->default_compute_power_profile;
+
+       return 0;
+}
 /**
 * Initializes the SMC table and uploads it
 *
@@ -1934,6 +1971,9 @@ int fiji_init_smc_table(struct pp_hwmgr *hwmgr)
        result = fiji_populate_pm_fuses(hwmgr);
        PP_ASSERT_WITH_CODE(0 == result,
                        "Failed to  populate PM fuses to SMC memory!", return result);
+
+       fiji_save_default_power_profile(hwmgr);
+
        return 0;
 }
 
@@ -2378,3 +2418,28 @@ bool fiji_is_dpm_running(struct pp_hwmgr *hwmgr)
                        CGS_IND_REG__SMC, FEATURE_STATUS, VOLTAGE_CONTROLLER_ON))
                        ? true : false;
 }
+
+int fiji_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr,
+               struct amd_pp_profile *request)
+{
+       struct fiji_smumgr *smu_data = (struct fiji_smumgr *)
+                       (hwmgr->smumgr->backend);
+       struct SMU73_Discrete_GraphicsLevel *levels =
+                       smu_data->smc_state_table.GraphicsLevel;
+       uint32_t array = smu_data->smu7_data.dpm_table_start +
+                       offsetof(SMU73_Discrete_DpmTable, GraphicsLevel);
+       uint32_t array_size = sizeof(struct SMU73_Discrete_GraphicsLevel) *
+                       SMU73_MAX_LEVELS_GRAPHICS;
+       uint32_t i;
+
+       for (i = 0; i < smu_data->smc_state_table.GraphicsDpmLevelCount; i++) {
+               levels[i].ActivityLevel =
+                               cpu_to_be16(request->activity_threshold);
+               levels[i].EnabledForActivity = 1;
+               levels[i].UpHyst = request->up_hyst;
+               levels[i].DownHyst = request->down_hyst;
+       }
+
+       return smu7_copy_bytes_to_smc(hwmgr->smumgr, array, (uint8_t *)levels,
+                               array_size, SMC_RAM_END);
+}

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h
index d30d150f9ca67e5384f3e6ba5a13d46a780d4e52..0e9e1f2d7238da3741324fd478630f6a700344c7 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h
@@ -46,6 +46,7 @@ uint32_t fiji_get_mac_definition(uint32_t value);
 int fiji_process_firmware_header(struct pp_hwmgr *hwmgr);
 int fiji_initialize_mc_reg_table(struct pp_hwmgr *hwmgr);
 bool fiji_is_dpm_running(struct pp_hwmgr *hwmgr);
-
+int fiji_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr,
+               struct amd_pp_profile *request);
 #endif
 

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
index 54b347366b5d15e5591827612ee685175c128edf..a1cb78552cf69372997cbb1c1cb36e92d825095b 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
@@ -519,4 +519,5 @@ const struct pp_smumgr_func fiji_smu_funcs = {
        .get_mac_definition = fiji_get_mac_definition,
        .initialize_mc_reg_table = fiji_initialize_mc_reg_table,
        .is_dpm_running = fiji_is_dpm_running,
+       .populate_requested_graphic_levels = fiji_populate_requested_graphic_levels,
 };