Merge tag 'amd-drm-next-6.1-2022-09-08' of https://gitlab.freedesktop.org/agd5f/linux...

amd-drm-next-6.1-2022-09-08:

amdgpu:
- Mode2 reset for RDNA2
- Lots of new DC documentation
- Add documentation about different asic families
- DSC improvements
- Aldebaran fixes
- Misc spelling and grammar fixes
- GFXOFF stats support for vangogh
- DC frame size fixes
- NBIO 7.7 updates
- DCN 3.2 updates
- DCN 3.1.4 Updates
- SMU 13.x updates
- Misc bug fixes
- Rework DC register offset handling
- GC 11.x updates
- PSP 13.x updates
- SDMA 6.x updates
- GMC 11.x updates
- SR-IOV updates
- PSP fixes for TA unloading
- DSC passthrough support
- Misc code cleanups

amdkfd:
- ISA fixes for some GC 10.3 IPs
- Misc code cleanups

radeon:
- Delayed work flush fix
- Use time_after for some jiffies calculations

drm:
- DSC passthrough aux support

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220908155202.57862-1-alexander.deucher@amd.com

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dm_helpers.h
Simple merge

diff --cc drivers/gpu/drm/display/drm_dp_mst_topology.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc include/drm/display/drm_dp.h
Simple merge

diff --cc include/drm/display/drm_dp_mst_helper.h
index 43f58cef4eec61d42c6f0a9f431a0f625135c83b,4a39c95f8afd38b33998ed9ebfc19828e0e27df4..41fd8352ab65613b160a10c9b12a5cfe27b267e8
--- 1/include/drm/display/drm_dp_mst_helper.h
--- 2/include/drm/display/drm_dp_mst_helper.h
+++ b/include/drm/display/drm_dp_mst_helper.h
@@@ -126,8 -142,10 +128,9 @@@ struct drm_dp_mst_port 
         */
        struct drm_dp_mst_branch *mstb;
        struct drm_dp_aux aux; /* i2c bus for this port? */
+       struct drm_dp_aux *passthrough_aux;
        struct drm_dp_mst_branch *parent;
  
 -      struct drm_dp_vcpi vcpi;
        struct drm_connector *connector;
        struct drm_dp_mst_topology_mgr *mgr;