Merge tag 'amd-drm-next-5.8-2020-05-12' of git://people.freedesktop.org/~agd5f/linux...

amd-drm-next-5.8-2020-05-12:

amdgpu:
- Misc cleanups
- RAS fixes
- Expose FP16 for modesetting
- DP 1.4 compliance test fixes
- Clockgating fixes
- MAINTAINERS update
- Soft recovery for gfx10
- Runtime PM cleanups
- PSP code cleanups

amdkfd:
- Track GPU memory utilization per process
- Report PCI domain in topology

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

diff --cc MAINTAINERS
index 225bc22c410631de052d387283e6a259552fe71a,c173a85b72e3891071655f4fa58657cc4713442e..41de15567b8a5419549e51fc6cdea5a7b203c71f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14063,14 -13952,13 +14063,13 @@@ F:        drivers/net/wireless/quantenn
  RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <[email protected]>
  M:    Christian König <[email protected]>
- M:    David (ChunMing) Zhou <[email protected]>
  L:    [email protected]
 -T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
 -F:    drivers/gpu/drm/radeon/
 -F:    include/uapi/drm/radeon_drm.h
 +T:    git git://people.freedesktop.org/~agd5f/linux
  F:    drivers/gpu/drm/amd/
 +F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
 +F:    include/uapi/drm/radeon_drm.h
  
  RADEON FRAMEBUFFER DISPLAY DRIVER
  M:    Benjamin Herrenschmidt <[email protected]>

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

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

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

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