Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 12 Dec 2018 23:49:04 +0000 (09:49 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 13 Dec 2018 00:06:34 +0000 (10:06 +1000)
commite7df065a697783ecb5c6eaa5692d78dcfceb71dd
tree2e42f7ec8ac73c13ffd6575e016dad1beb4de83b
parente69aa5f9b97f7f871643336deb281db5cb14878b
parent674e78acae0dfb4beb56132e41cbae5b60f7d662
Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm-next

[airlied: make etnaviv build again]

amdgpu:
- DC trace support
- More DC documentation
- XGMI hive reset support
- Rework IH interaction with KFD
- Misc fixes and cleanups
- Powerplay updates for newer polaris variants
- Add cursor plane update fast path
- Enable gpu reset by default on CI parts
- Fix config with KFD/HSA not enabled

amdkfd:
- Limit vram overcommit
- dmabuf support
- Support for doorbell BOs

ttm:
- Support for simultaneous submissions to multiple engines

scheduler:
- Add helpers for hw with preemption support

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181207233119.16861-1-alexander.deucher@amd.com
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
drivers/gpu/drm/amd/amdgpu/soc15.c
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
drivers/gpu/drm/etnaviv/etnaviv_dump.c
drivers/gpu/drm/qxl/qxl_release.c