From: Nevenko Stupar <[email protected]> [WHAT] Add additional info from DML for DMU when applicable on future platforms.
Reviewed-by: Alvin Lee <[email protected]> Signed-off-by: Nevenko Stupar <[email protected]> Signed-off-by: Chenyu Chen <[email protected]> --- drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 3 ++- .../gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 ee721606b883..f667026cb43e 100644 --- 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 452e4a2e72c0..943fd3f040c3 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 @@ -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 { -- 2.43.0
