drm/amd/display: Various DML2 fixes for FAMS2

The disable fams2 operation was reworked, but some of the old code
remained. This commit removes the disable_fams2_drr from the
dml2_stream_parameters.

Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Dillon Varone <dillon.varone@amd.com>
Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_display_cfg_types.h b/drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_display_cfg_types.h
index fe153f4edaf55dcaae62a0ff993685a034a78c50..b132f676a68dc9a4111801386a2b447f9386f2c9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_display_cfg_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_display_cfg_types.h
@@ -410,7 +410,6 @@ struct dml2_stream_parameters {
                enum dml2_odm_mode odm_mode;
                bool disable_dynamic_odm;
                bool disable_subvp;
-               bool disable_fams2_drr;
                int minimum_vblank_idle_requirement_us;
                bool minimize_active_latency_hiding;
 

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
index fa445067782ebd3fa97805fcd9e7870c7db6ca44..dddb21818f8abb41e9a740995073db10395cb063 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
@@ -1012,7 +1012,7 @@ static bool all_timings_support_drr(const struct dml2_pmo_instance *pmo,
                        stream_descriptor = &display_config->display_config.stream_descriptors[i];
                        stream_fams2_meta = &pmo->scratch.pmo_dcn4.stream_fams2_meta[i];
 
-                       if (!stream_descriptor->timing.drr_config.enabled || stream_descriptor->overrides.disable_fams2_drr)
+                       if (!stream_descriptor->timing.drr_config.enabled)
                                return false;
 
                        /* cannot support required vtotal */