This DC patch-set brings improvements in multiple areas. In summary, we highlight: * DCN315 fixes * DCN31 fixes * DPIA fixes * Dump the pipe topology when it updates * Misc code cleanups * New debugfs interface to query the current ODM combine configuration * ODM fixes * Potential deadlock while waiting for MPC idle fix * Support for windowed MPO ODM Cc: Daniel Wheeler <daniel.wheeler@xxxxxxx> Aurabindo Pillai (2): drm/amd/display: Fix incorrect comment drm/amd/display: Add debugfs interface for ODM combine info Charlene Liu (1): drm/amd/display: correct z8_watermark 16bit to 20bit mask Dillon Varone (1): drm/amd/display: Skip dmub memory flush when not needed Ethan Bitnun (1): drm/amd/display: Add support for 1080p SubVP to reduce idle power Fudong Wang (1): drm/amd/display: Add smu write msg id fail retry process Gabe Teeger (1): drm/amd/display: Remove wait while locked Martin Leung (1): drm/amd/display: 3.2.249 Mustapha Ghaddar (1): drm/amd/display: Add DPIA Link Encoder Assignment Fix Wenjing Liu (12): Partially revert "drm/amd/display: update add plane to context logic with a new algorithm" drm/amd/display: update blank state on ODM changes drm/amd/display: always switch off ODM before committing more streams drm/amd/display: add comments to add plane functions drm/amd/display: rename function to add otg master for stream drm/amd/display: add new resource interface for acquiring sec opp heads and release pipe drm/amd/display: add new resource interfaces to update odm mpc slice count drm/amd/display: add more pipe resource interfaces drm/amd/display: use new pipe allocation interface in dcn32 fpu drm/amd/display: switch to new ODM policy for windowed MPO ODM support drm/amd/display: add pipe topology update log drm/amd/display: fix pipe topology logging error .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 36 +- drivers/gpu/drm/amd/display/dc/Makefile | 1 + .../display/dc/clk_mgr/dcn315/dcn315_smu.c | 20 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 68 +- .../drm/amd/display/dc/core/dc_link_enc_cfg.c | 35 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 1473 +++++++++++++---- .../gpu/drm/amd/display/dc/core/dc_stream.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 3 +- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 59 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 22 +- .../drm/amd/display/dc/dcn20/dcn20_resource.h | 4 +- .../amd/display/dc/dcn201/dcn201_resource.c | 1 + .../drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + .../drm/amd/display/dc/dcn30/dcn30_resource.c | 1 + .../amd/display/dc/dcn301/dcn301_resource.c | 1 + .../amd/display/dc/dcn302/dcn302_resource.c | 1 + .../amd/display/dc/dcn303/dcn303_resource.c | 1 + .../drm/amd/display/dc/dcn31/dcn31_hubbub.c | 32 +- .../drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + .../amd/display/dc/dcn314/dcn314_resource.c | 24 + .../amd/display/dc/dcn315/dcn315_resource.c | 1 + .../amd/display/dc/dcn316/dcn316_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 25 + .../gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 1 + .../drm/amd/display/dc/dcn32/dcn32_resource.c | 274 ++- .../drm/amd/display/dc/dcn32/dcn32_resource.h | 12 +- .../display/dc/dcn32/dcn32_resource_helpers.c | 46 + .../amd/display/dc/dcn321/dcn321_resource.c | 1 + .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 6 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 491 ++++-- .../gpu/drm/amd/display/dc/inc/core_types.h | 11 + .../amd/display/dc/inc/hw/timing_generator.h | 1 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 262 ++- .../drm/amd/display/dc/link/link_factory.c | 4 + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 8 + .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 3 +- 36 files changed, 2220 insertions(+), 713 deletions(-) -- 2.41.0