From: Dave Airlie <airlied@redhat.com>
Date: Thu, 14 May 2020 03:21:30 +0000 (+1000)
Subject: Merge tag 'amd-drm-next-5.8-2020-05-12' of git://people.freedesktop.org/~agd5f/linux... 
X-Git-Tag: block-5.8-2020-06-11~21^2~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=49eea1c6573a6e31d79783c716b9001c968e5662;p=linux-block.git

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

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 <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200512213703.4039-1-alexander.deucher@amd.com
---

49eea1c6573a6e31d79783c716b9001c968e5662
diff --cc MAINTAINERS
index 225bc22c4106,c173a85b72e3..41de15567b8a
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14063,14 -13952,13 +14063,13 @@@ F:	drivers/net/wireless/quantenn
  RADEON and AMDGPU DRM DRIVERS
  M:	Alex Deucher <alexander.deucher@amd.com>
  M:	Christian König <christian.koenig@amd.com>
- M:	David (ChunMing) Zhou <David1.Zhou@amd.com>
  L:	amd-gfx@lists.freedesktop.org
 -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 <benh@kernel.crashing.org>