Merge tag 'amd-drm-next-5.16-2021-09-27' of https://gitlab.freedesktop.org/agd5f...

amd-drm-next-5.16-2021-09-27:

amdgpu:
- RAS improvements
- BACO fixes
- Yellow Carp updates
- Misc code cleanups
- Initial DP 2.0 support
- VCN priority handling
- Cyan Skillfish updates
- Rework IB handling for multimedia engine tests
- Backlight fixes
- DCN 3.1 power saving improvements
- Runtime PM fixes
- Modifier support for DCC image stores for gfx 10.3
- Hotplug fixes
- Clean up stack related warnings in display code
- DP alt mode fixes
- Display rework for better handling FP code
- Debugfs fixes

amdkfd:
- SVM fixes
- DMA map fixes

radeon:
- AGP fix

From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Dave Airlie <[email protected]>

diff --cc MAINTAINERS
index f9d5d3ffd18a5b14e4726fb3b07568a790d35eca,379092f34fffa82620f507d10e645b6393234683..fbfeca76f2af49a70b4c4afced064e2b1b901edb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -982,14 -977,8 +982,14 @@@ M:       Evan Quan <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
- F:    drivers/gpu/drm/amd/pm/powerplay/
+ F:    drivers/gpu/drm/amd/pm/
  
 +AMD PTDMA DRIVER
 +M:    Sanjay R Mehta <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/dma/ptdma/
 +
  AMD SEATTLE DEVICE TREE SUPPORT
  M:    Brijesh Singh <[email protected]>
  M:    Suravee Suthikulpanit <[email protected]>

diff --cc drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
Simple merge