* program scrambler bits for hdmi2 and dp1.2 * some minor cleanups Amy Zhang (1): drm/amd/dal: Track windowed_fullscreen state in freesync module Harry Wentland (4): drm/amd/dal: Remove extra newline drm/amd/dal: program HDMI_DATA_SCRAMBLER bit for HDMI 2.0 drm/amd/dal: Program DPHY_SCRAM_CNTL for HBR2 compliance pattern drm/amd/dal: Remove unneccessary macro Zeyu Fan (2): drm/amd/dal: DCE clock source consoldiation and refactor. drm/amd/dal: Pass in shift and mask values for I2C of DCE100 and up. drivers/gpu/drm/amd/dal/dc/dce/Makefile | 3 +- drivers/gpu/drm/amd/dal/dc/dce/dce_audio.h | 5 +- .../dce_clock_source.c} | 455 +++++++++++++-------- .../dce_clock_source.h} | 59 ++- drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 7 + drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.h | 3 + .../gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c | 39 +- .../gpu/drm/amd/dal/dc/dce/dce_stream_encoder.h | 4 + .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 53 +-- drivers/gpu/drm/amd/dal/dc/dce110/Makefile | 2 +- .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 43 +- drivers/gpu/drm/amd/dal/dc/dce112/Makefile | 2 +- .../drm/amd/dal/dc/dce112/dce112_clock_source.c | 278 ------------- .../drm/amd/dal/dc/dce112/dce112_clock_source.h | 59 --- .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 66 +-- drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 50 ++- .../drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.c | 12 +- .../dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c | 55 +-- .../dal/dc/i2caux/dce110/i2c_hw_engine_dce110.h | 124 +++++- .../drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.c | 18 +- .../drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.h | 6 +- .../drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.c | 12 +- drivers/gpu/drm/amd/dal/include/dal_asic_id.h | 1 - .../gpu/drm/amd/dal/modules/freesync/freesync.c | 7 +- drivers/gpu/drm/amd/dal/modules/inc/mod_freesync.h | 2 + 25 files changed, 718 insertions(+), 647 deletions(-) rename drivers/gpu/drm/amd/dal/dc/{dce110/dce110_clock_source.c => dce/dce_clock_source.c} (76%) rename drivers/gpu/drm/amd/dal/dc/{dce110/dce110_clock_source.h => dce/dce_clock_source.h} (53%) delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce112/dce112_clock_source.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce112/dce112_clock_source.h -- 2.9.3