Backmerge v4.1-rc4 into into drm-next

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
	drivers/gpu/drm/drm_irq.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 078092c5a59f0259c59db0907f074d409ab5c245,596ee5cd3b842df597c57ee890d16a97ec8cc9ae..4e215bd4d41f0ae872c2568f1746b9c9ec68e6c8
--- 1/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
--- 2/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@@ -884,6 -883,8 +885,7 @@@ static int create_queue_cpsch(struct de
                return -ENOMEM;
        }
  
 -      init_sdma_vm(dqm, q, qpd);
 -
++      dqm->ops_asic_specific.init_sdma_vm(dqm, q, qpd);
        retval = mqd->init_mqd(mqd, &q->mqd, &q->mqd_mem_obj,
                                &q->gart_mqd_addr, &q->properties);
        if (retval != 0)

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_lvds.c
Simple merge