Commit bae04c96 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2025-10-02' of... 

Merge tag 'drm-misc-next-fixes-2025-10-02' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

Short summary of fixes pull:

v3d:
- Fix fence locking

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20251002122303.GA21323@linux.fritz.box
parents b2ec5ca9 adefb2cc

drivers/gpu/drm/v3d/v3d_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ struct v3d_queue_state { 
	/* Currently active job for this queue */

	struct v3d_job *active_job;

	spinlock_t queue_lock;

	/* Protect dma fence for signalling job completion */

	spinlock_t fence_lock;

};



/* Performance monitor object. The perform lifetime is controlled by userspace

drivers/gpu/drm/v3d/v3d_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct dma_fence *v3d_fence_create(struct v3d_dev *v3d, enum v3d_queue q) 
	fence->dev = &v3d->drm;

	fence->queue = q;

	fence->seqno = ++queue->emit_seqno;

	dma_fence_init(&fence->base, &v3d_fence_ops, &queue->queue_lock,

	dma_fence_init(&fence->base, &v3d_fence_ops, &queue->fence_lock,

		       queue->fence_context, fence->seqno);



	return &fence->base;

drivers/gpu/drm/v3d/v3d_gem.c

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ v3d_gem_init(struct drm_device *dev) 
		seqcount_init(&queue->stats.lock);



		spin_lock_init(&queue->queue_lock);

		spin_lock_init(&queue->fence_lock);

	}



	spin_lock_init(&v3d->mm_lock);