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

[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

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

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

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

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

diff --cc drivers/gpu/drm/etnaviv/etnaviv_dump.c
index 9146e30e24a6de20d8bda5f80c7ea7470ddca334,fd6bad2100cff7fa12482415777747ce4369bc37..3fbb4855396cc98505eeb2062de6579c01478d57
--- 1/drivers/gpu/drm/etnaviv/etnaviv_dump.c
--- 2/drivers/gpu/drm/etnaviv/etnaviv_dump.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
@@@ -134,13 -135,13 +135,13 @@@ void etnaviv_core_dump(struct etnaviv_g
                    mmu_size + gpu->buffer.size;
  
        /* Add in the active command buffers */
-       spin_lock(&gpu->sched.job_list_lock);
 -      spin_lock_irqsave(&sched->job_list_lock, flags);
++      spin_lock_irqsave(&gpu->sched.job_list_lock, flags);
        list_for_each_entry(s_job, &gpu->sched.ring_mirror_list, node) {
                submit = to_etnaviv_submit(s_job);
                file_size += submit->cmdbuf.size;
                n_obj++;
        }
-       spin_unlock(&gpu->sched.job_list_lock);
 -      spin_unlock_irqrestore(&sched->job_list_lock, flags);
++      spin_unlock_irqrestore(&gpu->sched.job_list_lock, flags);
  
        /* Add in the active buffer objects */
        list_for_each_entry(vram, &gpu->mmu->mappings, mmu_node) {
@@@ -182,14 -183,14 +183,14 @@@
                              gpu->buffer.size,
                              etnaviv_cmdbuf_get_va(&gpu->buffer));
  
-       spin_lock(&gpu->sched.job_list_lock);
 -      spin_lock_irqsave(&sched->job_list_lock, flags);
++      spin_lock_irqsave(&gpu->sched.job_list_lock, flags);
        list_for_each_entry(s_job, &gpu->sched.ring_mirror_list, node) {
                submit = to_etnaviv_submit(s_job);
                etnaviv_core_dump_mem(&iter, ETDUMP_BUF_CMD,
                                      submit->cmdbuf.vaddr, submit->cmdbuf.size,
                                      etnaviv_cmdbuf_get_va(&submit->cmdbuf));
        }
-       spin_unlock(&gpu->sched.job_list_lock);
 -      spin_unlock_irqrestore(&sched->job_list_lock, flags);
++      spin_unlock_irqrestore(&gpu->sched.job_list_lock, flags);
  
        /* Reserve space for the bomap */
        if (n_bomap_pages) {

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