Skip to content

Commit cb158e3

Browse files
melissawenpopcornmix
authored andcommitted
drm/v3d: create a dedicated lock for dma fence
Don't mix dma fence lock with the active_job lock. Fixes: 5a72e3a ("drm/v3d: Address race-condition between per-fd GPU stats and fd release") #downstream hash Co-developed-by: Maíra Canal <[email protected]> Signed-off-by: Maíra Canal <[email protected]> Signed-off-by: Melissa Wen <[email protected]>
1 parent d140b69 commit cb158e3

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

drivers/gpu/drm/v3d/v3d_drv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ struct v3d_queue_state {
6262
/* Currently active job for this queue */
6363
struct v3d_job *active_job;
6464
spinlock_t queue_lock;
65+
spinlock_t fence_lock;
6566
};
6667

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

drivers/gpu/drm/v3d/v3d_fence.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ struct dma_fence *v3d_fence_create(struct v3d_dev *v3d, enum v3d_queue q)
1515
fence->dev = &v3d->drm;
1616
fence->queue = q;
1717
fence->seqno = ++queue->emit_seqno;
18-
dma_fence_init(&fence->base, &v3d_fence_ops, &queue->queue_lock,
18+
dma_fence_init(&fence->base, &v3d_fence_ops, &queue->fence_lock,
1919
queue->fence_context, fence->seqno);
2020

2121
return &fence->base;

drivers/gpu/drm/v3d/v3d_gem.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ v3d_gem_init(struct drm_device *dev)
274274
seqcount_init(&queue->stats.lock);
275275

276276
spin_lock_init(&queue->queue_lock);
277+
spin_lock_init(&queue->fence_lock);
277278
}
278279

279280
spin_lock_init(&v3d->mm_lock);

0 commit comments

Comments
 (0)