drm/amd/display: Additional info from DML for DMU

[WHAT]
Add additional info from DML for DMU when applicable
on future platforms.

Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Signed-off-by: Nevenko Stupar <Nevenko.Stupar@amd.com>
Signed-off-by: Chenyu Chen <chen-yu.chen@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_utils.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_utils.c
index ee721606b883962dc1775c92b06f1ecafb264250..f667026cb43eb8a0de5eabe9f100974c91a1db0d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_utils.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_utils.c
@@ -387,7 +387,8 @@ void dml21_build_fams2_programming(const struct dc *dc,
        memset(&context->bw_ctx.bw.dcn.fams2_stream_sub_params_v2, 0, sizeof(union dmub_fams2_stream_static_sub_state_v2) * DML2_MAX_PLANES);
        memset(&context->bw_ctx.bw.dcn.fams2_global_config, 0, sizeof(struct dmub_cmd_fams2_global_config));
 
-       if (dml_ctx->v21.mode_programming.programming->fams2_required) {
+       if ((dml_ctx->v21.mode_programming.programming->fams2_required) ||
+               (dml_ctx->v21.mode_programming.programming->legacy_pstate_info_for_dmu)) {
                for (i = 0; i < context->stream_count; i++) {
                        int dml_stream_idx;
                        struct dc_stream_state *phantom_stream;

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 452e4a2e72c01ae4430661af1bb585c1679ca233..943fd3f040c3ae678264fe4f6630c91fb9baa017 100644 (file)
--- 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
@@ -418,6 +418,7 @@ struct dml2_display_cfg_programming {
 
        /* indicates this configuration requires FW to support */
        bool fams2_required;
+       bool legacy_pstate_info_for_dmu;
        struct dmub_cmd_fams2_global_config fams2_global_config;
 
        struct {