drm/amd/display: make variable latency into a regkey option

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
index 9cb0836..3ec702f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
@@ -906,11 +906,16 @@ bool dcn_validate_bandwidth(
        scaler_settings_calculation(v);
        mode_support_and_system_configuration(v);
 
-       if (v->voltage_level == 0) {
+       if (v->voltage_level == 0 &&
+                       (dc->public.debug.sr_exit_time_dpm0_ns
+                               || dc->public.debug.sr_enter_plus_exit_time_dpm0_ns)) {
                struct core_dc *dc_core = DC_TO_CORE(&dc->public);
 
-               v->sr_enter_plus_exit_time = 9.466f;
-               v->sr_exit_time = 7.849f;
+               if (dc->public.debug.sr_enter_plus_exit_time_dpm0_ns)
+                       v->sr_enter_plus_exit_time =
+                               dc->public.debug.sr_enter_plus_exit_time_dpm0_ns / 1000.0f;
+               if (dc->public.debug.sr_exit_time_dpm0_ns)
+                       v->sr_exit_time =  dc->public.debug.sr_exit_time_dpm0_ns / 1000.0f;
                dc_core->dml.soc.sr_enter_plus_exit_time_us = v->sr_enter_plus_exit_time;
                dc_core->dml.soc.sr_exit_time_us = v->sr_exit_time;
                mode_support_and_system_configuration(v);

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 62493c4..cb70b6d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -171,6 +171,8 @@ struct dc_debug {
        bool disable_pplib_wm_range;
        bool use_dml_wm;
        bool disable_pipe_split;
+       int sr_exit_time_dpm0_ns;
+       int sr_enter_plus_exit_time_dpm0_ns;
        int sr_exit_time_ns;
        int sr_enter_plus_exit_time_ns;
        int urgent_latency_ns;