From: Maxime Ripard <mripard@kernel.org>
Date: Mon, 15 Dec 2025 08:27:39 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f790dd21a931c61167f7bdc327aecf2cebad327;p=thirdparty%2Fkernel%2Flinux.git

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>
---

7f790dd21a931c61167f7bdc327aecf2cebad327
diff --cc drivers/dma-buf/dma-fence.c
index c82aa8ae14548,b4f5c86352764..21c5c30b4f34f
--- a/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/panthor/panthor_mmu.c
index ca112d874ecb9,d4839d282689f..473a8bebd61ec
--- a/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;
  }