Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions drivers/gpu/drm/v3d/v3d_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/v3d/v3d_fence.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/v3d/v3d_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,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);
Expand Down