Summary of changes: * Flattening aux_engine and engine * Fix Vega black screen issue Anthony Koo (1): drm/amd/display: Prevent PSR from being enabled if initialization fails Bhawanpreet Lakha (2): drm/amd/display: Retry link training again drm/amd/display: flatten aux_engine and engine Harry Wentland (1): drm/amd/display: DC 3.1.59 Jerry (Fangzhi) Zuo (1): drm/amd/display: Fix Vega10 black screen after mode change drivers/gpu/drm/amd/display/dc/core/dc_link.c | 20 +++- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 5 +- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 55 ++++----- drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 38 +++--- .../drm/amd/display/dc/dce100/dce100_resource.c | 4 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 5 + .../drm/amd/display/dc/dce110/dce110_resource.c | 4 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 4 +- .../amd/display/dc/dce120/dce120_hw_sequencer.c | 10 ++ .../drm/amd/display/dc/dce120/dce120_resource.c | 4 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 127 ++++++++++++++++----- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/engine.h | 106 ----------------- 21 files changed, 205 insertions(+), 208 deletions(-) delete mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/engine.h -- 2.14.1