drm/amd/powerplay: enable ACG feature on vega10.

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index d6f097f44b6cfe8587b64c16cfa6af4663c729e7..b14ea319bd95bb4d14708ca33e7a75bd52ea25ea 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -321,8 +321,7 @@ static void vega10_init_dpm_defaults(struct pp_hwmgr *hwmgr)
                        FEATURE_LED_DISPLAY_BIT;
        data->smu_features[GNLD_FAN_CONTROL].smu_feature_id =
                        FEATURE_FAN_CONTROL_BIT;
-       data->smu_features[GNLD_VOLTAGE_CONTROLLER].smu_feature_id =
-                       FEATURE_VOLTAGE_CONTROLLER_BIT;
+       data->smu_features[GNLD_ACG].smu_feature_id = FEATURE_ACG_BIT;
 
        if (!data->registry_data.prefetcher_dpm_key_disabled)
                data->smu_features[GNLD_DPM_PREFETCHER].supported = true;
@@ -386,6 +385,12 @@ static void vega10_init_dpm_defaults(struct pp_hwmgr *hwmgr)
        if (data->registry_data.vr0hot_enabled)
                data->smu_features[GNLD_VR0HOT].supported = true;
 
+       smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_GetSmuVersion);
+       vega10_read_arg_from_smc(hwmgr->smumgr, &(data->smu_version));
+               /* ACG firmware has major version 5 */
+       if ((data->smu_version & 0xff000000) == 0x5000000)
+               data->smu_features[GNLD_ACG].supported = true;
+
 }
 
 #ifdef PPLIB_VEGA10_EVV_SUPPORT
@@ -2228,6 +2233,21 @@ static int vega10_populate_avfs_parameters(struct pp_hwmgr *hwmgr)
                        pp_table->DisplayClock2Gfxclk[DSPCLK_PHYCLK].m1_shift = 24;
                        pp_table->DisplayClock2Gfxclk[DSPCLK_PHYCLK].m2_shift = 12;
                        pp_table->DisplayClock2Gfxclk[DSPCLK_PHYCLK].b_shift = 12;
+
+                       pp_table->AcgBtcGbVdroopTable.a0       = avfs_params.ulAcgGbVdroopTableA0;
+                       pp_table->AcgBtcGbVdroopTable.a0_shift = 20;
+                       pp_table->AcgBtcGbVdroopTable.a1       = avfs_params.ulAcgGbVdroopTableA1;
+                       pp_table->AcgBtcGbVdroopTable.a1_shift = 20;
+                       pp_table->AcgBtcGbVdroopTable.a2       = avfs_params.ulAcgGbVdroopTableA2;
+                       pp_table->AcgBtcGbVdroopTable.a2_shift = 20;
+
+                       pp_table->AcgAvfsGb.m1                   = avfs_params.ulAcgGbFuseTableM1;
+                       pp_table->AcgAvfsGb.m2                   = avfs_params.ulAcgGbFuseTableM2;
+                       pp_table->AcgAvfsGb.b                    = avfs_params.ulAcgGbFuseTableB;
+                       pp_table->AcgAvfsGb.m1_shift             = 0;
+                       pp_table->AcgAvfsGb.m2_shift             = 0;
+                       pp_table->AcgAvfsGb.b_shift              = 0;
+
                } else {
                        data->smu_features[GNLD_AVFS].supported = false;
                }
@@ -2236,6 +2256,55 @@ static int vega10_populate_avfs_parameters(struct pp_hwmgr *hwmgr)
        return 0;
 }
 
+static int vega10_acg_enable(struct pp_hwmgr *hwmgr)
+{
+       struct vega10_hwmgr *data =
+                       (struct vega10_hwmgr *)(hwmgr->backend);
+       uint32_t agc_btc_response;
+
+       if (data->smu_features[GNLD_ACG].supported) {
+               if (0 == vega10_enable_smc_features(hwmgr->smumgr, true,
+                                       data->smu_features[GNLD_DPM_PREFETCHER].smu_feature_bitmap))
+                       data->smu_features[GNLD_DPM_PREFETCHER].enabled = true;
+
+               smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_InitializeAcg);
+
+               smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_RunAcgBtc);
+               vega10_read_arg_from_smc(hwmgr->smumgr, &agc_btc_response);;
+
+               if (1 == agc_btc_response) {
+                       if (1 == data->acg_loop_state)
+                               smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_RunAcgInClosedLoop);
+                       else if (2 == data->acg_loop_state)
+                               smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_RunAcgInOpenLoop);
+                       if (0 == vega10_enable_smc_features(hwmgr->smumgr, true,
+                               data->smu_features[GNLD_ACG].smu_feature_bitmap))
+                                       data->smu_features[GNLD_ACG].enabled = true;
+               } else {
+                       pr_info("[ACG_Enable] ACG BTC Returned Failed Status!\n");
+                       data->smu_features[GNLD_ACG].enabled = false;
+               }
+       }
+
+       return 0;
+}
+
+static int vega10_acg_disable(struct pp_hwmgr *hwmgr)
+{
+       struct vega10_hwmgr *data =
+                       (struct vega10_hwmgr *)(hwmgr->backend);
+
+       if (data->smu_features[GNLD_ACG].supported) {
+               if (data->smu_features[GNLD_ACG].enabled) {
+               if (0 == vega10_enable_smc_features(hwmgr->smumgr, false,
+                               data->smu_features[GNLD_ACG].smu_feature_bitmap))
+                       data->smu_features[GNLD_ACG].enabled = false;
+               }
+       }
+
+       return 0;
+}
+
 static int vega10_populate_gpio_parameters(struct pp_hwmgr *hwmgr)
 {
        struct vega10_hwmgr *data =
@@ -2506,7 +2575,7 @@ static int vega10_init_smc_table(struct pp_hwmgr *hwmgr)
        result = vega10_avfs_enable(hwmgr, true);
        PP_ASSERT_WITH_CODE(!result, "Attempt to enable AVFS feature Failed!",
                                        return result);
-
+       vega10_acg_enable(hwmgr);
        vega10_save_default_power_profile(hwmgr);
 
        return 0;
@@ -4683,6 +4752,9 @@ static int vega10_disable_dpm_tasks(struct pp_hwmgr *hwmgr)
        PP_ASSERT_WITH_CODE((tmp_result == 0),
                        "Failed to disable ulv!", result = tmp_result);
 
+       tmp_result =  vega10_acg_disable(hwmgr);
+       PP_ASSERT_WITH_CODE((tmp_result == 0),
+                       "Failed to disable acg!", result = tmp_result);
        return result;
 }
 

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h
index 6e5c5b99593bcb8922546dc4c02983b88019d46b..415080174b28de570493e429b758f502ea2fcf4a 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h
@@ -64,7 +64,9 @@ enum {
        GNLD_FW_CTF,
        GNLD_LED_DISPLAY,
        GNLD_FAN_CONTROL,
-       GNLD_VOLTAGE_CONTROLLER,
+       GNLD_FEATURE_FAST_PPT_BIT,
+       GNLD_DIDT,
+       GNLD_ACG,
        GNLD_FEATURES_MAX
 };
 
@@ -381,6 +383,8 @@ struct vega10_hwmgr {
        struct vega10_smc_state_table  smc_state_table;
 
        uint32_t                       config_telemetry;
+       uint32_t                       smu_version;
+       uint32_t                       acg_loop_state;
 };
 
 #define VEGA10_DPM2_NEAR_TDP_DEC                      10