summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Zheng <Austin.Zheng@amd.com>2026-06-17 09:55:24 -0400
committerAlex Deucher <alexander.deucher@amd.com>2026-07-01 11:36:18 -0400
commite5316b76d31c93d9204e987a85bdbf1dce08a9cf (patch)
tree97db66cb415e1dde9707994d011be1908b2f3eba
parentd0a775e5d70b376696245a14c09e3aa6dde0023a (diff)
downloadlinux-stable-e5316b76d31c93d9204e987a85bdbf1dce08a9cf.tar.gz
linux-stable-e5316b76d31c93d9204e987a85bdbf1dce08a9cf.zip
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>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dc.h2
-rw-r--r--drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn401/dcn401_soc_and_ip_translator.c16
2 files changed, 0 insertions, 18 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index b323f7826451..92f84277c522 100644
--- 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 0c8e652c3532..89f7ccd7f81f 100644
--- 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)