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

Let's kickstart the v6.20 (7.0?) release cycle.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --cc drivers/dma-buf/dma-buf.c
Simple merge

diff --cc drivers/dma-buf/dma-fence.c
index c82aa8ae145485907ec5990cf71c8ac66d5b58a8,b4f5c8635276400751af73670ef768d20ac6681a..21c5c30b4f34f4889533b162604e38cbce88c8b9
--- 1/drivers/dma-buf/dma-fence.c
--- 2/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
@@@ -1164,8 -1140,8 +1164,8 @@@ const char __rcu *dma_fence_timeline_na
        RCU_LOCKDEP_WARN(!rcu_read_lock_held(),
                         "RCU protection is required for safe access to returned string");
  
 -      if (!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags))
 +      if (!dma_fence_test_signaled_flag(fence))
-               return fence->ops->get_driver_name(fence);
+               return fence->ops->get_timeline_name(fence);
        else
                return "signaled-timeline";
  }

diff --cc drivers/gpu/drm/bridge/ti-sn65dsi83.c
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_gem_shmem_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_panic.c
Simple merge

diff --cc drivers/gpu/drm/drm_plane.c
Simple merge

diff --cc drivers/gpu/drm/drm_vblank.c
Simple merge

diff --cc drivers/gpu/drm/i915/Makefile
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_object_types.h
Simple merge

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

diff --cc drivers/gpu/drm/panthor/panthor_gem.c
Simple merge

diff --cc drivers/gpu/drm/panthor/panthor_mmu.c
index ca112d874ecb9b937047fddb95c9ea604b7a6e51,d4839d282689faf39b0f629ad4dfde7a949cf6fb..473a8bebd61ecdb052c76a9e8685c33652b8fa61
--- 1/drivers/gpu/drm/panthor/panthor_mmu.c
--- 2/drivers/gpu/drm/panthor/panthor_mmu.c
+++ b/drivers/gpu/drm/panthor/panthor_mmu.c
@@@ -2219,11 -2103,15 +2150,11 @@@ static int panthor_gpuva_sm_step_unmap(
  {
        struct panthor_vma *unmap_vma = container_of(op->unmap.va, struct panthor_vma, base);
        struct panthor_vm *vm = priv;
 -      int ret;
 -
 -      ret = panthor_vm_unmap_pages(vm, unmap_vma->base.va.addr,
 -                                   unmap_vma->base.va.range);
 -      if (drm_WARN_ON(&vm->ptdev->base, ret))
 -              return ret;
  
 +      panthor_vm_unmap_pages(vm, unmap_vma->base.va.addr,
 +                             unmap_vma->base.va.range);
        drm_gpuva_unmap(&op->unmap);
-       panthor_vma_unlink(vm, unmap_vma);
+       panthor_vma_unlink(unmap_vma);
        return 0;
  }
  

diff --cc drivers/gpu/drm/panthor/panthor_sched.c
Simple merge

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

diff --cc drivers/video/fbdev/core/fbcon.c
Simple merge