It's been a while, which means there's about a month of stuff here. Been busy with getting stuff prepped for the DC pull request, XDC, and a bunch of other things. For major fixes we have: * Hang on hotplug fix drm/amd/display: fix multi-display on CZ * Hotplug not working after S3 drm/amd/display: Fix hotplug after s3 resume. drm/amd/display: Fix irq enable/disable on resume. Other than that we have * Bunch of work from Raven enablement, including * HW object refactor * Updated DML code (gcc-parseable HW gospel) * Corrected audio assignment * An FBC config option (for CZ/ST) Andrew Jiang (5): drm/amd/display: Force always scale chroma, set always_scaled to false drm/amd/display: power_down_Hw need signal type to turnoff backlight drm/amd/display: Move power control from link encoder to hwsequencer drm/amd/display: Add missing newlines in pstate wait debug messages drm/amd/display: Fix up plane_states add/remove logic Bhawanpreet Lakha (5): drm/amd/display: Refactor dc_update_planes_and_stream. drm/amd/display: fix re-enabling stutter for raven drm/amd/display: increase pstate wait timeout drm/amd/display: Fix underscan not using proper scaling drm/amd/display: change when to set tap_hardcode_coeff Charlene Liu (9): drm/amd/display: make sure BL off to mainlink off has enough time drm/amd/display: add hubp/dpp pg debug key drm/amd/display: temp disable DCC on high res. drm/amd/display: soc_bound_box -update DML based on HW. drm/amd/display: audio dynamic resource acquired related drm/amd/display: arbitration find the matching dig-az first. drm/amd/display: Add stereo_support debug flag drm/amd/display: Add debug flag for VSR support drm/amd/display: reject 3D mode based on static debug flag. Dmytro Laktyushkin (8): drm/amd/display: Restructuring and cleaning up DML drm/amd/display: add mode support check to dml vba code drm/amd/display: extract global sync params from vba drm/amd/display: change dml vba cursor count define to correct one drm/amd/display: block video planes >4k on dcn10 drm/amd/display: add max_video_width cap to dc drm/amd/display: add performance trace macro to dc drm/amd/display: Set addressable region as active + border Eric Bernstein (6): drm/amd/display: update mpc add/remove functions drm/amd/display: update blending mode and set output denorm drm/amd/display: clean up dcn10 dpp after HW review drm/amd/display: group DCN watermark registers drm/amd/display: Add DPP capabilities drm/amd/display: Expose some MPC functions for reuse Eric Yang (6): drm/amd/display: fix usb-c dongle regression drm/amd/display: add back removed hack for mpcc add drm/amd/display: Use active + border for bw validation drm/amd/display: Add override for reporting wm ranges drm/amd/display: Handle case when stream not found in set_dpms drm/amd/display: fix null dereference in reset hw ctx Harry Wentland (2): drm/amd/display: Don't report fake sink as connected drm/amd/display: Ignore wrong tautological warning Hersen Wu (4): drm/amd/display: Driver message to SMU to indicate display off drm/amd/display: screen flickers when connected to ext monitor in clone drm/amd/display: add dpms state to DC drm/amd/display: add dpms state to DC follow up Jerry Zuo (8): drm/amd/display: Exclude MST from fake sink drm/amd/display: Fix NULL pointer on MST chained mode drm/amd/display: Fix MST daisy chain SST not light up drm/amd/display: Fix ref_count messed up issue drm/amd/display: Do not access fbdev helper members drm/amd/display: Remove drm_modeset_lock in MST code drm/amd/display: Fix a logic defect in cursor move drm/amd/display: Remove a false-positive error message Ken Chalmers (1): drm/amd/display: fix ASSERT() caused by missing registers. Leo (Sunpeng) Li (4): drm/amd/display: Match actual state during S3 resume. drm/amd/display: Do not set bandwidth on page flips. drm/amd/display: Report stream as different on scaling change drm/amd/display: ASSERT on dc_create_state failing. Martin Tsai (1): drm/amd/display: To prevent detecting new sink from spurious HPD Roman Li (4): drm/amd/display: Add FBC on/off to front-end programming drm/amd/display: fix multi-display on CZ drm/amd/display: Fix hotplug after s3 resume. drm/amd/display: Fix irq enable/disable on resume. ShihChen Chen (1): drm/amd/display: make tile changing run at ISR Shirish S (1): drm/amd/display: make FBC configurable option SivapiriyanKumarasamy (2): drm/amd/display: Program stream's csc matrix instead of using default drm/amd/display: Pull transfer func defines into DC Tony Cheng (10): drm/amd/display: version 3.1.02 drm/amd/display: enable optional pipe split for single display drm/amd/display: add option to disable DCC for DCC 128b request drm/amd/display: option to maximize lb usage drm/amd/display: fix bug in force_single_disp_pipe_split drm/amd/display: dal 3.1.03 drm/amd/display: align DCLK to voltage level drm/amd/display: wrong VM setting cause invalid DF request from DCN drm/amd/display: dal 3.1.04 drm/amd/display: dal 3.1.05 Vitaly Prosyak (1): drm/amd/display: [RV] bug in cm programming Wenjing Liu (3): drm/amd/display: set cp25201 to use TPS4 drm/amd/display: update link type to mst before topology discovery drm/amd/display: disconnect on HPD low even if edid is the same Yongqiang Sun (9): drm/amd/display: Fixed validation return wrong result. drm/amd/display: Fixed incorrect return value for validaton drm/amd/display: Early return when turn off a plane. drm/amd/display: Only reset top pipe back end. drm/amd/display: Enable double buffer as per vertical interrupt enabled. drm/amd/display: Program front end first when set mode. drm/amd/display: Fixed extend to second screen mode hang drm/amd/display: wa to program split pipedegamma regs after mode set. drm/amd/display: Fixed switching mode half screen gamma incorrect. Yue Hin Lau (13): drm/amd/display: Refactor dcn10_dpp_cm_helper to dcn10_cm_common drm/amd/display: fixing register includes drm/amd/display: removing remaining register definitions work around drm/amd/display: moving backlight registers to hwsequencer drm/amd/display: edp backlight regression fix drm/amd/display: moving cursor functions from ipp to mem_input drm/amd/display: Expose some mem_input functions for reuse drm/amd/display: renaming mem input to hubp drm/amd/display: Making hubp1_program_surface_config public drm/amd/display: rename struct mem_input to hubp for dcn drm/amd/display: renaming filename for hubp drm/amd/display: add null check for cursor functions drm/amd/display: rename transform to dpp for dcn drivers/gpu/drm/amd/display/Kconfig | 10 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 110 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 6 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 135 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 6 + drivers/gpu/drm/amd/display/dc/basics/logger.c | 78 +- drivers/gpu/drm/amd/display/dc/basics/logger.h | 37 - drivers/gpu/drm/amd/display/dc/calcs/Makefile | 2 +- .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.c | 16 + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 224 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 442 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 78 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 16 +- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 17 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 108 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 63 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 1 + drivers/gpu/drm/amd/display/dc/dc.h | 135 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 175 +- drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 2 + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 253 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 20 +- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 3 - .../drm/amd/display/dc/dce100/dce100_resource.c | 2 +- .../drm/amd/display/dc/dce100/dce100_resource.h | 2 +- .../drm/amd/display/dc/dce110/dce110_compressor.c | 2 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 316 +- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 11 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 33 +- drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 4 +- .../{dcn10_dpp_cm_helper.c => dcn10_cm_common.c} | 2 +- .../{dcn10_dpp_cm_helper.h => dcn10_cm_common.h} | 4 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 199 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 127 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 263 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 190 +- .../dc/dcn10/{dcn10_mem_input.c => dcn10_hubp.c} | 344 +- .../dc/dcn10/{dcn10_mem_input.h => dcn10_hubp.h} | 139 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 359 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 189 - drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 215 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 45 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 99 +- .../amd/display/dc/dcn10/dcn10_timing_generator.c | 15 + .../amd/display/dc/dcn10/dcn10_timing_generator.h | 15 +- drivers/gpu/drm/amd/display/dc/dm_services.h | 2 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +- drivers/gpu/drm/amd/display/dc/dml/dc_features.h | 2 + .../drm/amd/display/dc/dml/display_mode_enums.h | 56 +- .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 7 +- .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 8 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 903 +-- .../drm/amd/display/dc/dml/display_mode_support.c | 2326 -------- .../drm/amd/display/dc/dml/display_mode_support.h | 199 - .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 6104 ++++++++++++++++++++ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 581 ++ .../drm/amd/display/dc/dml/display_pipe_clocks.c | 377 +- .../drm/amd/display/dc/dml/display_pipe_clocks.h | 8 +- .../drm/amd/display/dc/dml/display_rq_dlg_calc.c | 2457 ++++---- .../drm/amd/display/dc/dml/display_rq_dlg_calc.h | 151 +- .../amd/display/dc/dml/display_rq_dlg_helpers.c | 482 +- .../amd/display/dc/dml/display_rq_dlg_helpers.h | 41 +- .../gpu/drm/amd/display/dc/dml/display_watermark.c | 1281 ---- .../gpu/drm/amd/display/dc/dml/display_watermark.h | 98 - .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 1903 ++++++ .../amd/display/dc/dml/dml1_display_rq_dlg_calc.h | 67 + .../gpu/drm/amd/display/dc/dml/dml_common_defs.c | 24 +- .../gpu/drm/amd/display/dc/dml/dml_common_defs.h | 11 +- .../gpu/drm/amd/display/dc/dml/soc_bounding_box.c | 45 +- .../gpu/drm/amd/display/dc/dml/soc_bounding_box.h | 9 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 16 +- drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 134 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 105 + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 6 +- drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 11 +- drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 15 +- drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 57 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 12 +- drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 4 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 5 + .../amd/display/dc/virtual/virtual_link_encoder.c | 13 +- .../gpu/drm/amd/display/include/logger_interface.h | 28 + drivers/gpu/drm/amd/display/include/logger_types.h | 36 +- 85 files changed, 13615 insertions(+), 8494 deletions(-) rename drivers/gpu/drm/amd/display/dc/dcn10/{dcn10_dpp_cm_helper.c => dcn10_cm_common.c} (99%) rename drivers/gpu/drm/amd/display/dc/dcn10/{dcn10_dpp_cm_helper.h => dcn10_cm_common.h} (97%) rename drivers/gpu/drm/amd/display/dc/dcn10/{dcn10_mem_input.c => dcn10_hubp.c} (73%) rename drivers/gpu/drm/amd/display/dc/dcn10/{dcn10_mem_input.h => dcn10_hubp.h} (85%) delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_support.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_support.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_watermark.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_watermark.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.h create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h -- 2.14.1