Merge drm/drm-next into drm-misc-next

Backmerging into drm-misc-next to get DRM accelerator infrastructure,
which is required by ipuv driver.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/Makefile
Simple merge

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 09042486e66e29dac845b73c95681c53cd978cd7,4f38c55e767e1bf313c228fa409c1ce923a55f26..76a2b4a4de10e57091627439ff315e2d468b5aca
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@@ -36,8 -36,8 +36,9 @@@
  #include <generated/utsrelease.h>
  #include <linux/pci-p2pdma.h>
  
+ #include <drm/drm_aperture.h>
  #include <drm/drm_atomic_helper.h>
 +#include <drm/drm_crtc_helper.h>
  #include <drm/drm_fb_helper.h>
  #include <drm/drm_probe_helper.h>
  #include <drm/amdgpu_drm.h>

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
Simple merge

diff --cc drivers/video/fbdev/core/fbcon.c
Simple merge

diff --cc drivers/video/fbdev/hyperv_fb.c
Simple merge

diff --cc include/drm/drm_drv.h
Simple merge

diff --cc samples/vfio-mdev/mdpy-fb.c
Simple merge