drm/amd/powerplay: add function set_clock_limit for Rv.

Sets floors for various clocks depending on current
requirements.

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

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
index 631ef82b5d7ffce835d013f313167db5e006e694..654dd43b8639391f65347dddb3b23e0bea5c2700 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
@@ -44,6 +44,8 @@
 
 
 static const unsigned long PhwRaven_Magic = (unsigned long) PHM_Cz_Magic;
+int rv_display_clock_voltage_request(struct pp_hwmgr *hwmgr,
+               struct pp_display_clock_request *clock_req);
 
 struct phm_vq_budgeting_record rv_vqtable[] = {
        /* _TBD
@@ -232,9 +234,61 @@ static int rv_construct_boot_state(struct pp_hwmgr *hwmgr)
        return 0;
 }
 
-static int rv_tf_set_isp_clock_limit(struct pp_hwmgr *hwmgr, void *input,
+static int rv_tf_set_clock_limit(struct pp_hwmgr *hwmgr, void *input,
                                void *output, void *storage, int result)
 {
+       struct rv_hwmgr *rv_data = (struct rv_hwmgr *)(hwmgr->backend);
+       struct PP_Clocks clocks = {0};
+       struct pp_display_clock_request clock_req;
+
+       clocks.dcefClock = hwmgr->display_config.min_dcef_set_clk;
+       clocks.dcefClockInSR = hwmgr->display_config.min_dcef_deep_sleep_set_clk;
+       clock_req.clock_type = amd_pp_dcf_clock;
+       clock_req.clock_freq_in_khz = clocks.dcefClock * 10;
+
+       if (clocks.dcefClock == 0 && clocks.dcefClockInSR == 0)
+               clock_req.clock_freq_in_khz = rv_data->dcf_actual_hard_min_freq;
+
+       PP_ASSERT_WITH_CODE(!rv_display_clock_voltage_request(hwmgr, &clock_req),
+                               "Attempt to set DCF Clock Failed!", return -EINVAL);
+
+       if(rv_data->need_min_deep_sleep_dcefclk && 0 != clocks.dcefClockInSR)
+               smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
+                                       PPSMC_MSG_SetMinDeepSleepDcefclk,
+                                       clocks.dcefClockInSR / 100);
+       /*
+       if(!rv_data->isp_tileA_power_gated || !rv_data->isp_tileB_power_gated) {
+               if ((hwmgr->ispArbiter.iclk != 0) && (rv_data->ISPActualHardMinFreq != (hwmgr->ispArbiter.iclk / 100) )) {
+                       smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
+                                       PPSMC_MSG_SetHardMinIspclkByFreq, hwmgr->ispArbiter.iclk / 100);
+                       rv_read_arg_from_smc(hwmgr->smumgr, &rv_data->ISPActualHardMinFreq),
+               }
+       } */
+
+       if((hwmgr->gfx_arbiter.sclk_hard_min != 0) &&
+               ((hwmgr->gfx_arbiter.sclk_hard_min / 100) != rv_data->soc_actual_hard_min_freq)) {
+               smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
+                                       PPSMC_MSG_SetHardMinSocclkByFreq,
+                                       hwmgr->gfx_arbiter.sclk_hard_min / 100);
+                       rv_read_arg_from_smc(hwmgr->smumgr, &rv_data->soc_actual_hard_min_freq);
+       }
+
+       if ((hwmgr->gfx_arbiter.gfxclk != 0) &&
+               (rv_data->gfx_actual_soft_min_freq != (hwmgr->gfx_arbiter.gfxclk))) {
+               smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
+                                       PPSMC_MSG_SetMinVideoGfxclkFreq,
+                                       hwmgr->gfx_arbiter.gfxclk / 100);
+               rv_read_arg_from_smc(hwmgr->smumgr, &rv_data->gfx_actual_soft_min_freq);
+       }
+
+       if ((hwmgr->gfx_arbiter.fclk != 0) &&
+               (rv_data->fabric_actual_soft_min_freq != (hwmgr->gfx_arbiter.fclk / 100))) {
+               smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
+                                       PPSMC_MSG_SetMinVideoFclkFreq,
+                                       hwmgr->gfx_arbiter.fclk / 100);
+               rv_read_arg_from_smc(hwmgr->smumgr, &rv_data->fabric_actual_soft_min_freq);
+       }
+
        return 0;
 }
 
@@ -254,7 +308,7 @@ static int rv_tf_set_num_active_display(struct pp_hwmgr *hwmgr, void *input,
 }
 
 static const struct phm_master_table_item rv_set_power_state_list[] = {
-       { NULL, rv_tf_set_isp_clock_limit },
+       { NULL, rv_tf_set_clock_limit },
        { NULL, rv_tf_set_num_active_display },
        { }
 };

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h
index 673369131e08f87de5f834e531d13c4b0332726b..afb852295a1573d148fa6eaca387840f14033641 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h
@@ -276,6 +276,11 @@ struct rv_hwmgr {
        bool                           isp_tileB_power_gated;
        uint32_t                       isp_actual_hard_min_freq;
        uint32_t                       soc_actual_hard_min_freq;
+       uint32_t                       dcf_actual_hard_min_freq;
+
+       uint32_t                        f_actual_hard_min_freq;
+       uint32_t                        fabric_actual_soft_min_freq;
+       uint32_t                        gfx_actual_soft_min_freq;
 
        bool                           vcn_power_gated;
        bool                           vcn_dpg_mode;
@@ -286,6 +291,7 @@ struct rv_hwmgr {
        DpmClocks_t                       clock_table;
 
        uint32_t active_process_mask;
+       bool need_min_deep_sleep_dcefclk; /* disabled by default */
 };
 
 struct pp_hwmgr;