* Update DML21 code. * Fixes for FAMS2 interface. * HDMI fixes. * Compilation warning fixes. Cc: Daniel Wheeler <daniel.wheeler@xxxxxxx> Alex Hung (1): drm/amd/display: Fix uninitialized variables in amdgpu_dm_debugfs Alvin Lee (1): drm/amd/display: Update FAMS2 config cmd Aric Cyr (1): drm/amd/display: 3.2.314 Austin Zheng (1): drm/amd/display: DML21 Reintegration For Various Fixes Charlene Liu (1): drm/amd/display: init dc_power_state Chris Park (1): drm/amd/display: Block Invalid TMDS operation Dillon Varone (3): drm/amd/display: Add support for FAMS2+ interface versions drm/amd/display: Add new message for DF throttling optimization on dcn401 drm/amd/display: Re-validate streams on commit_streams Fangzhi Zuo (1): drm/amd/display: Fix Mode Cutoff in DSC Passthrough to DP2.1 Monitor George Shen (1): drm/amd/display: Disable MPC rate control on ODM pipe update Harry VanZyllDeJong (1): drm/amd/display: Fix brightness adjustment on MiniLED Meerpate Patel (1): drm/amd/display: initialize uninitialized variable Nicholas Kazlauskas (2): drm/amd/display: Apply (some) policy for DML2 formulation on DCN35/DCN351 drm/amd/display: Don't allow IPS2 in D0 for RCG Dynamic Rodrigo Siqueira (1): Revert "drm/amd/display: Fix green screen issue after suspend" Shunlu Zhang (1): drm/amd/display: delete legacy code .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 8 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 22 +- .../amd/display/amdgpu_dm/amdgpu_dm_plane.h | 3 +- .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 46 + .../dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 1 + .../clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c | 23 + .../clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h | 3 + drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +- drivers/gpu/drm/amd/display/dc/dc.h | 6 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 40 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 1 + .../drm/amd/display/dc/dce/dce_clock_source.c | 3 + .../dc/dml/dcn30/display_rq_dlg_calc_30.c | 1 + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 15 +- .../amd/display/dc/dml2/display_mode_core.c | 6 +- .../dc/dml2/display_mode_core_structs.h | 103 +- .../amd/display/dc/dml2/display_mode_util.c | 6 +- .../dc/dml2/dml21/dml21_translation_helper.c | 16 +- .../amd/display/dc/dml2/dml21/dml21_utils.c | 80 +- .../dml21/inc/bounding_boxes/dcn4_soc_bb.h | 3 +- .../dml21/inc/dml_top_display_cfg_types.h | 52 +- .../dml21/inc/dml_top_soc_parameter_types.h | 2 + .../display/dc/dml2/dml21/inc/dml_top_types.h | 77 +- .../dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 42 +- .../src/dml2_core/dml2_core_dcn4_calcs.c | 1306 +++++++++++------ .../src/dml2_core/dml2_core_dcn4_calcs.h | 2 +- .../src/dml2_core/dml2_core_shared_types.h | 129 +- .../dml21/src/dml2_core/dml2_core_utils.c | 223 ++- .../dml21/src/dml2_core/dml2_core_utils.h | 6 +- .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 49 +- .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 394 +++-- .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 7 + .../dml21/src/dml2_pmo/dml2_pmo_factory.c | 1 - .../dml21/src/dml2_top/dml2_top_interfaces.c | 51 + .../dml2/dml21/src/dml2_top/dml2_top_legacy.c | 4 + .../dml2/dml21/src/dml2_top/dml2_top_legacy.h | 9 + .../src/dml2_top/dml2_top_optimization.c | 307 ---- .../src/dml2_top/dml2_top_optimization.h | 33 - .../dml2/dml21/src/dml2_top/dml2_top_soc15.c | 1177 +++++++++++++++ .../{dml_top_mcache.h => dml2_top_soc15.h} | 20 +- .../dml2/dml21/src/dml2_top/dml_top_mcache.c | 549 ------- .../dc/dml2/dml21/src/inc/dml2_debug.c | 5 + .../dc/dml2/dml21/src/inc/dml2_debug.h | 46 +- .../src/inc/dml2_internal_shared_types.h | 60 +- .../display/dc/dml2/dml2_translation_helper.c | 54 +- .../display/dc/dml2/dml_display_rq_dlg_calc.c | 12 - .../amd/display/dc/hwss/dcn31/dcn31_init.c | 2 +- .../amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 12 + .../amd/display/dc/hwss/dcn314/dcn314_init.c | 2 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 12 + .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 5 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 3 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 4 + .../drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 18 + .../drm/amd/display/dc/mpc/dcn30/dcn30_mpc.h | 7 + .../amd/display/dc/optc/dcn401/dcn401_optc.c | 4 +- .../dc/resource/dcn401/dcn401_resource.c | 4 + 59 files changed, 3225 insertions(+), 1880 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_interfaces.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c rename drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/{dml_top_mcache.h => dml2_top_soc15.h} (58%) delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.c -- 2.45.2