This DC patchset brings improvements in multiple areas. In summary, we have: - Improve the message printed - Disable dcn315 pixel rate crb when scaling - Update SR watermarks for DCN314 - Fix dcn315 pixel rate crb scaling check - Reset CRTC State Before Restore from S2idle - Have Payload Properly Created After Resume - Trigger DIO FIFO resync on commit streams - Revert vblank change that causes null pointer crash - Fix possible underflow for displays with large vblank - Apply 60us prefetch for DCFCLK <= 300Mhz - Update correct DCN314 register header Cc: Daniel Wheeler <daniel.wheeler@xxxxxxx> Alan Liu (1): drm/amd/display: Fix warning in disabling vblank irq Alvin Lee (1): drm/amd/display: Apply 60us prefetch for DCFCLK <= 300Mhz Aric Cyr (1): drm/amd/display: 3.2.237 Aurabindo Pillai (1): drm/amd/display: improve the message printed when loading DC Cruise Hung (2): drm/amd/display: Fix DMUB debugging print issue drm/amd/display: Update correct DCN314 register header Daniel Miess (2): drm/amd/display: Revert vblank change that causes null pointer crash drm/amd/display: Fix possible underflow for displays with large vblank Dmytro Laktyushkin (2): drm/amd/display: disable dcn315 pixel rate crb when scaling drm/amd/display: fix dcn315 pixel rate crb scaling check Fangzhi Zuo (1): drm/amd/display: Have Payload Properly Created After Resume Hersen Wu (1): drm/amd/display: lower dp link training message level Josip Pavic (1): drm/amd/display: cache trace buffer size Nicholas Kazlauskas (1): drm/amd/display: Update SR watermarks for DCN314 Qingqing Zhuo (1): drm/amd/display: Clean FPGA code in dc Rodrigo Siqueira (1): drm/amd/display: Reorganize DCN30 Makefile Saaem Rizvi (2): drm/amd/display: Trigger DIO FIFO resync on commit streams drm/amd/display: Trigger DIO FIFO resync on commit streams for DCN32 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 +++-- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 +-- .../dc/clk_mgr/dce112/dce112_clk_mgr.c | 8 +- .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 2 - .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 22 ++-- .../dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 6 - .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 +-- .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 5 - .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 10 +- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 18 +-- .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 10 +- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 26 ++--- .../dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 10 +- .../dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 11 +- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 1 - drivers/gpu/drm/amd/display/dc/core/dc.c | 14 ++- .../gpu/drm/amd/display/dc/core/dc_stream.c | 30 ----- drivers/gpu/drm/amd/display/dc/dc.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 103 ++++++------------ drivers/gpu/drm/amd/display/dc/dc_helper.c | 4 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 7 -- .../drm/amd/display/dc/dce/dce_clock_source.c | 38 ------- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 2 - .../display/dc/dce110/dce110_hw_sequencer.c | 6 +- .../display/dc/dce112/dce112_hw_sequencer.c | 3 - .../display/dc/dce120/dce120_hw_sequencer.c | 3 - .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 36 +----- .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 2 - .../drm/amd/display/dc/dcn10/dcn10_resource.c | 5 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 4 +- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 5 - .../gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 4 - .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 1 - .../drm/amd/display/dc/dcn20/dcn20_resource.c | 15 +-- .../drm/amd/display/dc/dcn201/dcn201_hwseq.c | 20 +--- .../drm/amd/display/dc/dcn201/dcn201_optc.c | 1 - .../amd/display/dc/dcn201/dcn201_resource.c | 5 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 4 - .../drm/amd/display/dc/dcn21/dcn21_resource.c | 10 +- drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 38 +++++-- .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 28 ----- .../gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 4 - .../gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 - .../drm/amd/display/dc/dcn30/dcn30_resource.c | 8 +- .../amd/display/dc/dcn301/dcn301_resource.c | 10 +- .../amd/display/dc/dcn302/dcn302_resource.c | 5 +- .../amd/display/dc/dcn303/dcn303_resource.c | 5 +- .../drm/amd/display/dc/dcn31/dcn31_hwseq.c | 31 +----- .../gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 4 - .../drm/amd/display/dc/dcn31/dcn31_resource.c | 17 +-- .../drm/amd/display/dc/dcn314/dcn314_dccg.c | 11 ++ .../drm/amd/display/dc/dcn314/dcn314_dccg.h | 5 +- .../drm/amd/display/dc/dcn314/dcn314_hwseq.c | 27 +++++ .../drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 + .../drm/amd/display/dc/dcn314/dcn314_init.c | 5 +- .../amd/display/dc/dcn314/dcn314_resource.c | 10 +- .../amd/display/dc/dcn315/dcn315_resource.c | 30 ++--- .../amd/display/dc/dcn316/dcn316_resource.c | 17 +-- .../gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 21 +--- .../gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h | 5 +- .../drm/amd/display/dc/dcn32/dcn32_hwseq.c | 27 +++++ .../drm/amd/display/dc/dcn32/dcn32_hwseq.h | 2 + .../gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 5 +- .../drm/amd/display/dc/dcn32/dcn32_resource.c | 11 +- .../amd/display/dc/dcn321/dcn321_resource.c | 11 +- .../amd/display/dc/dml/dcn301/dcn301_fpu.c | 2 - .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 17 +-- .../dc/dml/dcn31/display_rq_dlg_calc_31.c | 8 -- .../amd/display/dc/dml/dcn314/dcn314_fpu.c | 6 +- .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 8 -- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 4 +- .../dc/dml/dcn32/display_mode_vba_32.c | 4 +- .../dc/dml/dcn32/display_mode_vba_32.h | 2 +- .../amd/display/dc/dml/dcn321/dcn321_fpu.c | 4 - .../drm/amd/display/dc/dml/display_mode_lib.c | 1 - .../drm/amd/display/dc/dml/display_mode_lib.h | 1 - drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 + .../amd/display/dc/inc/hw_sequencer_private.h | 2 + .../display/dc/link/hwss/link_hwss_hpo_dp.c | 73 ------------- .../gpu/drm/amd/display/dc/link/link_dpms.c | 35 ++---- .../dc/link/protocols/link_dp_capability.c | 3 +- .../dc/link/protocols/link_dp_training.c | 17 ++- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + drivers/gpu/drm/amd/display/dmub/src/Makefile | 2 +- .../drm/amd/display/dmub/src/dmub_dcn314.c | 62 +++++++++++ .../drm/amd/display/dmub/src/dmub_dcn314.h | 33 ++++++ .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 7 +- 87 files changed, 409 insertions(+), 740 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.c create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.h -- 2.25.1
