From: Dillon Varone <[email protected]>

Why:
DRR can extend blanking beyond nominal vblank, but the existing stutter
eligibility checks can reject streams using the nominal blanking duration.

How:
Add a PMO option to relax the blanking factor for fixed-DRR streams,
and apply the relaxed threshold when checking Z8 and regular stutter
latency requirements.

Signed-off-by: Dillon Varone <[email protected]>
Signed-off-by: Wayne Lin <[email protected]>
---
 .../dc/dml2_0/dml21/inc/dml_top_types.h       |  1 +
 .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c  | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h 
b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h
index 75a24a85775e..fd7ccefc7fb7 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h
@@ -83,6 +83,7 @@ struct dml2_pmo_options {
        bool force_optional_uclk_pstate_support;
        bool force_optional_mcache_support;
        bool force_optional_ppt_temp_read_admissibility;
+       bool relax_stutter_constraint_for_drr;
        struct dml2_pmo_pstate_strategy 
*override_strategy_lists[DML2_MAX_PLANES];
        unsigned int num_override_strategies_per_list[DML2_MAX_PLANES];
 };
diff --git 
a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
 
b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
index de078ccd91a2..3584dbe4c9fb 100644
--- 
a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
+++ 
b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
@@ -8,7 +8,7 @@
 #include "dml2_pmo_dcn4_fams2.h"
 
 static const double MIN_VACTIVE_MARGIN_PCT = 0.25; // We need more than 
non-zero margin because DET buffer granularity can alter vactive latency hiding
-static const double MIN_BLANK_STUTTER_FACTOR = 3.0;
+static const double MIN_BLANK_STUTTER_FACTOR = 3.0f;
 
 static const struct dml2_pmo_pstate_strategy base_strategy_list_1_display[] = {
        // VActive Preferred
@@ -2357,6 +2357,16 @@ bool pmo_dcn4_fams2_optimize_for_pstate_support(struct 
dml2_pmo_optimize_for_pst
        return success;
 }
 
+static bool should_relax_stutter_constraint_for_stream(const struct 
dml2_pmo_init_for_stutter_in_out *in_out,
+               unsigned int stream_index)
+{
+       // relax the stutter constraint when:
+       // 1. Stream has DRR fixed enabled (assumed blank is extended 
sufficiently beyond nominal)
+       // 2. The option to relax stutter constraint is enabled in PMO options.
+       return 
in_out->base_display_config->display_config.stream_descriptors[stream_index].timing.drr_config.drr_active_fixed
 &&
+                       
in_out->instance->options->relax_stutter_constraint_for_drr;
+}
+
 bool pmo_dcn4_fams2_init_for_stutter(struct dml2_pmo_init_for_stutter_in_out 
*in_out)
 {
        bool success = true;
@@ -2365,6 +2375,7 @@ bool pmo_dcn4_fams2_init_for_stutter(struct 
dml2_pmo_init_for_stutter_in_out *in
        bool z8_stutter_optimization_too_expensive = false;
        bool stutter_optimization_too_expensive = false;
        double line_time_us, vblank_nom_time_us;
+       double stutter_factor;
 
        unsigned int i;
 
@@ -2382,15 +2393,17 @@ bool pmo_dcn4_fams2_init_for_stutter(struct 
dml2_pmo_init_for_stutter_in_out *in
        }
 
        for (i = 0; i < 
in_out->base_display_config->display_config.num_streams; i++) {
+               stutter_factor = 
should_relax_stutter_constraint_for_stream(in_out, i) ? 1.0f : 
MIN_BLANK_STUTTER_FACTOR;
+
                line_time_us = 
(double)in_out->base_display_config->display_config.stream_descriptors[i].timing.h_total
 / 
(in_out->base_display_config->display_config.stream_descriptors[i].timing.pixel_clock_khz
 * 1000) * 1000000;
                vblank_nom_time_us = line_time_us * 
in_out->base_display_config->display_config.stream_descriptors[i].timing.vblank_nom;
 
-               if (vblank_nom_time_us < 
pmo->soc_bb->power_management_parameters.z8_stutter_exit_latency_us * 
MIN_BLANK_STUTTER_FACTOR) {
+               if (vblank_nom_time_us < 
pmo->soc_bb->power_management_parameters.z8_stutter_exit_latency_us * 
stutter_factor) {
                        z8_stutter_optimization_too_expensive = true;
                        break;
                }
 
-               if (vblank_nom_time_us < 
pmo->soc_bb->power_management_parameters.stutter_enter_plus_exit_latency_us * 
MIN_BLANK_STUTTER_FACTOR) {
+               if (vblank_nom_time_us < 
pmo->soc_bb->power_management_parameters.stutter_enter_plus_exit_latency_us * 
stutter_factor) {
                        stutter_optimization_too_expensive = true;
                        break;
                }
-- 
2.43.0

Reply via email to