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

Required backmerge since we will be based on top of v5.11, and there
has been a request to backmerge already to upstream some features.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/msm/msm_gem.c
index f995cb0,9a7c49b..45e2312
--- 1/drivers/gpu/drm/msm/msm_gem.c
--- 2/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@@ -1180,9 -1211,9 +1211,9 @@@ struct drm_gem_object *msm_gem_import(s
                goto fail;
        }
  
 -      ret = drm_prime_sg_to_page_addr_arrays(sgt, msm_obj->pages, NULL, npages);
 +      ret = drm_prime_sg_to_page_array(sgt, msm_obj->pages, npages);
        if (ret) {
-               mutex_unlock(&msm_obj->lock);
+               msm_gem_unlock(obj);
                goto fail;
        }
  

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
Simple merge

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

diff --cc drivers/gpu/drm/radeon/radeon_cs.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_object.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_prime.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ttm.c
Simple merge

diff --cc drivers/gpu/drm/scheduler/sched_main.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_drv.h
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge