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

Kickstart new drm-misc-next cycle.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 489e22190e297419e7e42e184d30f097d64df571,38dade421d465e6f4dd0841d6082f998c80e2e34..1129e17e9f09c15d0a04139af826c3c894eb95af
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -1146,9 -1148,7 +1146,9 @@@ static void amdgpu_ttm_tt_unpopulate(st
        struct amdgpu_ttm_tt *gtt = (void *)ttm;
        struct amdgpu_device *adev;
  
-       if (gtt && gtt->userptr) {
 +      amdgpu_ttm_backend_unbind(bdev, ttm);
 +
+       if (gtt->userptr) {
                amdgpu_ttm_tt_set_user_pages(ttm, NULL);
                kfree(ttm->sg);
                ttm->sg = NULL;

diff --cc drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index e646aac9d7a4b9fe2ce29f6fc6e05b1515964db0,35eedc14f5228d5d4ca1f6339f52d3be987b48b2..f0a61a9474fccb0921cd739a1e5bbd20af08e97f
--- 1/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
--- 2/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@@ -118,6 -214,8 +214,7 @@@ static void i915_ttm_tt_destroy(struct 
  {
        struct i915_ttm_tt *i915_tt = container_of(ttm, typeof(*i915_tt), ttm);
  
 -      ttm_tt_destroy_common(bdev, ttm);
+       ttm_tt_fini(ttm);
        kfree(i915_tt);
  }
  

diff --cc drivers/gpu/drm/msm/msm_gem.h
Simple merge

diff --cc drivers/gpu/drm/panel/panel-simple.c
Simple merge

diff --cc drivers/gpu/drm/panfrost/panfrost_mmu.c
index c3fbe0ad9090bc24de0b4be2e0531862b6ed96e9,dfe5f1d2976367e71248ac7f3b044ecf6803387a..f7f83cf63f42b0af1baba4958b2f0abfa47015d6
--- 1/drivers/gpu/drm/panfrost/panfrost_mmu.c
--- 2/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@@ -121,10 -112,10 +112,10 @@@ static void panfrost_mmu_enable(struct 
        u64 transtab = cfg->arm_mali_lpae_cfg.transtab;
        u64 memattr = cfg->arm_mali_lpae_cfg.memattr;
  
-       mmu_hw_do_operation_locked(pfdev, as_nr, 0, ~0UL, AS_COMMAND_FLUSH_MEM);
+       mmu_hw_do_operation_locked(pfdev, as_nr, 0, ~0ULL, AS_COMMAND_FLUSH_MEM);
  
 -      mmu_write(pfdev, AS_TRANSTAB_LO(as_nr), transtab & 0xffffffffUL);
 -      mmu_write(pfdev, AS_TRANSTAB_HI(as_nr), transtab >> 32);
 +      mmu_write(pfdev, AS_TRANSTAB_LO(as_nr), lower_32_bits(transtab));
 +      mmu_write(pfdev, AS_TRANSTAB_HI(as_nr), upper_32_bits(transtab));
  
        /* Need to revisit mem attrs.
         * NC is the default, Mali driver is inner WT.

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

diff --cc drivers/gpu/drm/tegra/plane.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
index 0a3127436f61634cb6fcefc52bdbedb6f97b1139,bb9e02c31946e906bd5c2533082fe6c76055689b..3b22c0013dbf6a4775586388e5ea70942ded9c52
--- 1/drivers/gpu/drm/ttm/ttm_bo.c
--- 2/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@@ -1124,12 -1160,12 +1124,12 @@@ int ttm_bo_swapout(struct ttm_buffer_ob
        }
  
        if (bo->deleted) {
-               ttm_bo_cleanup_refs(bo, false, false, locked);
+               ret = ttm_bo_cleanup_refs(bo, false, false, locked);
                ttm_bo_put(bo);
-               return 0;
+               return ret == -EBUSY ? -ENOSPC : ret;
        }
  
 -      ttm_bo_del_from_lru(bo);
 +      ttm_bo_move_to_pinned(bo);
        /* TODO: Cleanup the locking */
        spin_unlock(&bo->bdev->lru_lock);
  

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

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

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

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
Simple merge

diff --cc include/drm/ttm/ttm_tt.h
Simple merge

diff --cc mm/vmscan.c
Simple merge