* Use update_surfaces for stream instead of special casing it * Fix wrong scanline reporting * Bunch of other bug fixes for Raven, Vega, and others * Some small cleanups and a large cleanup in memory interface Amy Zhang (2): drm/amd/display: Program CSC Mode For BT2020 drm/amd/display: Disable ABM when eDP is disabled Andrey Grodzovsky (7): drm/amd/display: Fix slow FPS. drm/amd/display: Use dc_update_surfaces_for_stream for flip. drm/amd/display: Clen unused interface. drm/amd/display: Unify loop for surface update and page flip. drm/amd/display: Add missed wait_for_prev_commits. drm/amd/display: Query for update plane type. drm/amd/display: Remove redundant condition. Ayyappa Chandolu (1): drm/amd/display: Fix ASSR enablement on DP to EDP converter Dmytro Laktyushkin (7): drm/amd/display: fix mpo blanking out on one of planes being set not visible drm/amd/display: dce 8 - 12 mem_input refactor to new style drm/amd/display: add missing GRPH_UPDATE_LOCK field macro for dce_mem_input drm/amd/display: make dc_get_validate_context re-entrant drm/amd/display: revert dc_get_validate_context re-entrancy fix drm/amd/display: remove GRPH_SURFACE_UPDATE_IMMEDIATE_EN field programming drm/amd/display: fix flip register write sequence Harry Wentland (2): drm/amd/display: Remove unused addr var in TG drm/amd/display: No need to assert on stream_status Leo (Sunpeng) Li (3): drm/amd/display: Fix dcn10 cursor set position hang drm/amd/display: Refactor use_lut() from dce110 to dce drm/amd/display: Implement input gamma LUT Roman Li (1): drm/amd/display: Fix 5th display lightup on Vega10 Tom St Denis (6): drm/amd/display: Tidy up dce120_timing_generator_enable_advanced_request() drm/amd/display: Fix indentation in dce120_tg_program_timing() drm/amd/display: Make dce120_tg_is_blanked() more legible drm/amd/display: Clean up indentation in dce120_tg_set_blank() drm/amd/display: Tidy up dce120_clock_source_create() drm/amd/display: Tidy up mem_input_program_surface_flip_and_addr() Tony Cheng (2): drm/amd/display: read VM settings from MMHUB drm/amd/display: fix YUV surface address programming sequence drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 172 +++++--- drivers/gpu/drm/amd/display/dc/core/dc.c | 61 ++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 16 + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 6 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 30 +- drivers/gpu/drm/amd/display/dc/dc.h | 14 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 21 + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 12 + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 2 + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 297 ++++++++++++-- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 115 ++++-- .../drm/amd/display/dc/dce100/dce100_resource.c | 100 ++--- drivers/gpu/drm/amd/display/dc/dce110/Makefile | 3 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 27 +- .../drm/amd/display/dc/dce110/dce110_mem_input.c | 437 --------------------- .../drm/amd/display/dc/dce110/dce110_mem_input.h | 121 ------ .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 158 ++++---- .../drm/amd/display/dc/dce110/dce110_mem_input_v.h | 66 +--- .../drm/amd/display/dc/dce110/dce110_resource.c | 80 ++-- drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 +- .../drm/amd/display/dc/dce112/dce112_mem_input.c | 54 --- .../drm/amd/display/dc/dce112/dce112_mem_input.h | 38 -- .../drm/amd/display/dc/dce112/dce112_resource.c | 104 ++--- .../drm/amd/display/dc/dce112/dce112_resource.h | 3 +- drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 +- .../drm/amd/display/dc/dce120/dce120_mem_input.c | 340 ---------------- .../drm/amd/display/dc/dce120/dce120_mem_input.h | 37 -- .../drm/amd/display/dc/dce120/dce120_resource.c | 79 +--- .../display/dc/dce120/dce120_timing_generator.c | 85 ++-- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 3 +- .../gpu/drm/amd/display/dc/dce80/dce80_mem_input.c | 83 ---- .../gpu/drm/amd/display/dc/dce80/dce80_mem_input.h | 36 -- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 100 ++--- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 47 ++- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 92 ++++- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 22 ++ .../gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c | 112 +++--- .../gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h | 26 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 3 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 38 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 16 +- drivers/gpu/drm/amd/display/dc/inc/resource.h | 9 +- 45 files changed, 1034 insertions(+), 2052 deletions(-) delete mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_mem_input.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_mem_input.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.h -- 2.11.0