Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm...

New features for 4.21:
amdgpu:
- Support for SDMA paging queue on vega
- Put compute EOP buffers into vram for better performance
- Share more code with amdkfd
- Support for scanout with DCC on gfx9
- Initial kerneldoc for DC
- Updated SMU firmware support for gfx8 chips
- Rework CSA handling for eventual support for preemption
- XGMI PSP support
- Clean up RLC handling
- Enable GPU reset by default on VI, SOC15 dGPUs
- Ring and IB test cleanups

amdkfd:
- Share more code with amdgpu

ttm:
- Move global init out of the drivers

scheduler:
- Track if schedulers are ready for work
- Timeout/fault handling changes to facilitate GPU recovery

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

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

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

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

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

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

diff --cc drivers/gpu/drm/bochs/bochs.h
Simple merge

diff --cc drivers/gpu/drm/bochs/bochs_mm.c
Simple merge

diff --cc drivers/gpu/drm/drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_sched.c
Simple merge

diff --cc drivers/gpu/drm/qxl/qxl_drv.h
Simple merge

diff --cc drivers/gpu/drm/qxl/qxl_ttm.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_execbuf_util.c
Simple merge

diff --cc drivers/gpu/drm/virtio/virtgpu_drv.h
Simple merge

diff --cc drivers/gpu/drm/virtio/virtgpu_ttm.c
Simple merge

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