drm/amd/display: Revert "Add Debug Option To Enable Per-DPM De-rate Usage"

Revert due to regression.
This reverts commit e82936e8dad0ccbe067323fe7c4e1ae4593104f3.

Reviewed-by: Martin Leung <martin.leung@amd.com>
Signed-off-by: Austin Zheng <Austin.Zheng@amd.com>
Signed-off-by: George Zhang <george.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index b323f7826451764bd8b7205042747280ea54727a..92f84277c5221c61a44a786112b7991798155668 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -1289,8 +1289,6 @@ struct dc_debug_options {
        bool enable_replay_esd_recovery;
        uint8_t iommu_mismatch_temp_wka;
        bool disable_dynamic_expansion_for_test_pattern;
-       uint32_t dml21_custom_derate_num_dpms;
-       uint32_t dml21_custom_derate_at_dpm[DML2_MAX_NUM_DPM_LVL];
 };
 
 

diff --git a/drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn401/dcn401_soc_and_ip_translator.c b/drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn401/dcn401_soc_and_ip_translator.c
index 0c8e652c35321e92a6848051594d2f61b01a751f..89f7ccd7f81f067d38a0cb0119a689ace5f89f4d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn401/dcn401_soc_and_ip_translator.c
+++ b/drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn401/dcn401_soc_and_ip_translator.c
@@ -269,22 +269,6 @@ void dcn401_update_soc_bb_with_values_from_software_policy(struct dml2_soc_bb *s
        if (dc->bb_overrides.sr_enter_plus_exit_z8_time_ns)
                soc_bb->power_management_parameters.z8_stutter_enter_plus_exit_latency_us =
                                dc->bb_overrides.sr_enter_plus_exit_z8_time_ns / 1000.0;
-
-       /* Override per-dpm derates based on a custom derate table.
-        * Global derate value will be used for derates that aren't populated
-        * 3 derates for a single DPM level:
-        *  bits 0-7: dram_derate_percent_pixel
-        *  bits 8-15: fclk_derate_percent
-        *  bits 16-23: dcfclk_derate_percent
-        */
-       for (unsigned int i = 0; i < dc->debug.dml21_custom_derate_num_dpms; i++) {
-               soc_bb->qos_parameters.derate_table_per_dpm.system_active_derates_per_dpm.dram_derate_percent_pixel[i]
-                       = dc->debug.dml21_custom_derate_at_dpm[i] & 0xFF;
-               soc_bb->qos_parameters.derate_table_per_dpm.system_active_derates_per_dpm.fclk_derate_percent[i]
-                       = (dc->debug.dml21_custom_derate_at_dpm[i] >> 8) & 0xFF;
-               soc_bb->qos_parameters.derate_table_per_dpm.system_active_derates_per_dpm.dcfclk_derate_percent[i]
-                       = (dc->debug.dml21_custom_derate_at_dpm[i] >> 16) & 0xFF;
-       }
 }
 
 static void apply_soc_bb_updates(struct dml2_soc_bb *soc_bb, const struct dc *dc, const struct dml2_configuration_options *config)