Cc: Daniel Wheeler <daniel.wheeler@xxxxxxx> Aric Cyr (1): drm/amd/display: 3.2.299 Daniel Sa (1): drm/amd/display: only trigger BIOS related assert for older ASICs Dillon Varone (2): Revert "drm/amd/display: Wait for all pending cleared before full update" drm/amd/display: Block timing sync for different signals in PMO Gabe Teeger (1): drm/amd/display: fix graphics hang in multi-display mst case Hansen Dsouza (1): drm/amd/display: Fix flickering caused by dccg Leo Li (1): drm/amd/display: Lock DC and exit IPS when changing backlight Meenakshikumar Somasundaram (1): drm/amd/display: Add dpia debug option to control power management Nicholas Susanto (2): drm/amd/display: Fix DCN35 set min dispclk logic drm/amd/display: Refactor dccg35_get_other_enabled_symclk_fe Qili Lu (1): drm/amd/display: fix dccg root clock optimization related hang Relja Vojvodic (1): drm/amd/display: Add sharpness control interface Samson Tam (2): drm/amd/display: re-enable Dynamic ODM policy drm/amd/display: disable sharpness if HDR Multiplier is too large .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +- .../drm/amd/display/dc/bios/command_table2.c | 2 +- .../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 6 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 8 +- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 9 +- drivers/gpu/drm/amd/display/dc/dc.h | 8 +- .../gpu/drm/amd/display/dc/dc_spl_translate.c | 52 +++-- drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 + .../amd/display/dc/dccg/dcn20/dcn20_dccg.h | 11 + .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 168 ++++++++------ .../amd/display/dc/dccg/dcn35/dcn35_dccg.h | 1 + .../dc/dml2/dml21/dml21_translation_helper.c | 3 +- .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 3 +- .../amd/display/dc/dml2/dml2_internal_types.h | 2 +- .../display/dc/dml2/dml2_translation_helper.c | 67 +++--- .../display/dc/dml2/dml2_translation_helper.h | 2 +- .../gpu/drm/amd/display/dc/dml2/dml2_utils.c | 12 +- .../display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 24 +- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 27 --- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 2 - .../amd/display/dc/hwss/dcn30/dcn30_init.c | 3 +- .../amd/display/dc/hwss/dcn301/dcn301_init.c | 1 - .../amd/display/dc/hwss/dcn32/dcn32_init.c | 1 - .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 49 +--- .../amd/display/dc/hwss/dcn401/dcn401_init.c | 1 - .../drm/amd/display/dc/hwss/hw_sequencer.h | 1 - drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + .../amd/display/dc/inc/hw/timing_generator.h | 4 +- .../amd/display/dc/optc/dcn10/dcn10_optc.h | 9 - .../amd/display/dc/optc/dcn20/dcn20_optc.h | 7 +- .../amd/display/dc/optc/dcn30/dcn30_optc.c | 45 ---- .../amd/display/dc/optc/dcn30/dcn30_optc.h | 13 +- .../amd/display/dc/optc/dcn301/dcn301_optc.c | 3 - .../amd/display/dc/optc/dcn31/dcn31_optc.h | 9 +- .../amd/display/dc/optc/dcn314/dcn314_optc.h | 9 +- .../amd/display/dc/optc/dcn32/dcn32_optc.c | 16 +- .../amd/display/dc/optc/dcn32/dcn32_optc.h | 7 +- .../amd/display/dc/optc/dcn35/dcn35_optc.h | 6 +- .../amd/display/dc/optc/dcn401/dcn401_optc.c | 4 +- .../amd/display/dc/optc/dcn401/dcn401_optc.h | 6 +- .../dc/resource/dcn32/dcn32_resource.h | 3 +- .../dc/resource/dcn401/dcn401_resource.h | 5 +- drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 4 +- .../display/dc/spl/dc_spl_isharp_filters.c | 213 +++++------------- .../display/dc/spl/dc_spl_isharp_filters.h | 2 +- .../gpu/drm/amd/display/dc/spl/dc_spl_types.h | 27 ++- .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 2 +- 48 files changed, 346 insertions(+), 532 deletions(-) -- 2.46.0