* Bunch of cleanups by Dave Airlie * Some gamma fixes and refactors * OPP refactor to follow new reg access model Amy Zhang (1): drm/amd/display: Framework for degamma and regramma through color module Anthony Koo (7): drm/amd/display: Refactor to move color helper into module drm/amd/display: Refactor output transfer function to stream drm/amd/display: Refactor to move gamma correction to module drm/amd/display: Implement PQ curve based on output transfer function drm/amd/display: Fix distribution of segments for PQ drm/amd/display: Fix programming of gamma end points drm/amd/display: Fix Regamma end point Dave Airlie (7): drm/amd/display: remove dc hub - this seems unused. drm/amd/display: remove some unused wrappers drm/amd/display: drop register logger and pid/tgid getters drm/amd/display: drop get platform info drm/amd/display: drop setmode complete notifier drm/amd/display: port to using drm dpcd defines drm/amd/display: assign correct enum for edp revision Dmytro Laktyushkin (1): drm/amd/display: define reg helpers to update registers with 8 and 9 fields Harry Wentland (1): drm/amd/display: Move dpcd structs into dp_types header Roman Li (1): drm/amd/display: fix hotplug regression after code refactor Tony Cheng (1): drm/amd/display: 4k split black out due to incorrect cursor Yongqiang Sun (2): drm/amd/display: Resolved HDMI assert in dal drm/amd/display: Add debug option to disable dmcu Zeyu Fan (1): drm/amd/display: OPP refactor and consolidation for DCE. .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 34 - .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 11 + drivers/gpu/drm/amd/display/dc/basics/Makefile | 2 +- .../drm/amd/display/dc/basics/register_logger.c | 197 ---- drivers/gpu/drm/amd/display/dc/calcs/gamma_calcs.c | 209 ++++- drivers/gpu/drm/amd/display/dc/core/dc.c | 50 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 +- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 146 +-- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 - drivers/gpu/drm/amd/display/dc/core/dc_target.c | 83 +- drivers/gpu/drm/amd/display/dc/dc.h | 26 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 359 ++++++++ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 9 + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 3 + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 996 +++++++++++++++++++++ drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 418 +++++++++ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 8 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 61 +- drivers/gpu/drm/amd/display/dc/dce110/Makefile | 4 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 68 +- drivers/gpu/drm/amd/display/dc/dce110/dce110_ipp.h | 3 +- .../drm/amd/display/dc/dce110/dce110_ipp_cursor.c | 3 +- .../drm/amd/display/dc/dce110/dce110_mem_input.c | 1 - drivers/gpu/drm/amd/display/dc/dce110/dce110_opp.c | 77 -- drivers/gpu/drm/amd/display/dc/dce110/dce110_opp.h | 149 --- .../gpu/drm/amd/display/dc/dce110/dce110_opp_csc.c | 363 -------- .../drm/amd/display/dc/dce110/dce110_opp_csc_v.c | 2 +- .../amd/display/dc/dce110/dce110_opp_formatter.c | 627 ------------- .../drm/amd/display/dc/dce110/dce110_opp_regamma.c | 537 ----------- .../amd/display/dc/dce110/dce110_opp_regamma_v.c | 2 +- .../gpu/drm/amd/display/dc/dce110/dce110_opp_v.c | 2 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 60 +- drivers/gpu/drm/amd/display/dc/dce112/Makefile | 3 +- drivers/gpu/drm/amd/display/dc/dce112/dce112_opp.c | 72 -- drivers/gpu/drm/amd/display/dc/dce112/dce112_opp.h | 48 - .../amd/display/dc/dce112/dce112_opp_formatter.c | 215 ----- .../drm/amd/display/dc/dce112/dce112_resource.c | 70 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 5 +- .../gpu/drm/amd/display/dc/dce80/dce80_mem_input.c | 1 - drivers/gpu/drm/amd/display/dc/dce80/dce80_opp.c | 136 --- drivers/gpu/drm/amd/display/dc/dce80/dce80_opp.h | 130 --- .../gpu/drm/amd/display/dc/dce80/dce80_opp_csc.c | 363 -------- .../drm/amd/display/dc/dce80/dce80_opp_formatter.c | 577 ------------ .../drm/amd/display/dc/dce80/dce80_opp_regamma.c | 543 ----------- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 45 +- drivers/gpu/drm/amd/display/dc/dm_services.h | 48 - drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 + drivers/gpu/drm/amd/display/dc/inc/gamma_calcs.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 - drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +- drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 25 + .../drm/amd/display/include/dal_register_logger.h | 42 - drivers/gpu/drm/amd/display/include/dpcd_defs.h | 597 +----------- .../drm/amd/display/include/link_service_types.h | 1 - drivers/gpu/drm/amd/display/modules/color/color.c | 652 ++++++++++++-- .../drm/amd/display/modules/color/color_helper.c | 199 ++++ .../drm/amd/display/modules/color/color_helper.h | 50 ++ .../gpu/drm/amd/display/modules/inc/mod_color.h | 123 ++- 63 files changed, 3280 insertions(+), 5215 deletions(-) delete mode 100644 drivers/gpu/drm/amd/display/dc/basics/register_logger.c create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_opp.c create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_opp.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_formatter.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_opp.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_opp.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_opp_formatter.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_opp.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_opp.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_opp_csc.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_opp_formatter.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_opp_regamma.c delete mode 100644 drivers/gpu/drm/amd/display/include/dal_register_logger.h create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_helper.c create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_helper.h -- 2.9.3