github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-28 17:55:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

nouveau: offload fence uevents work to workqueue

Browse Source 
This should break the deadlock between the fctx lock and the irq lock.

This offloads the processing off the work from the irq into a workqueue.

Cc: linux-stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/576237/
This commit is contained in:
Dave Airlie 2024-01-29 11:26:45 +10:00
parent b5e69be185
commit 39126abc5e
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/drm/nouveau/nouveau_fence.c
View File

@ -103,6 +103,7 @@ nouveau_fence_context_kill(struct nouveau_fence_chan *fctx, int error)
void void
nouveau_fence_context_del(struct nouveau_fence_chan *fctx) nouveau_fence_context_del(struct nouveau_fence_chan *fctx)
{ {
cancel_work_sync(&fctx->uevent_work);
nouveau_fence_context_kill(fctx, 0); nouveau_fence_context_kill(fctx, 0);
nvif_event_dtor(&fctx->event); nvif_event_dtor(&fctx->event);
fctx->dead = 1; fctx->dead = 1;
@ -145,12 +146,13 @@ nouveau_fence_update(struct nouveau_channel *chan, struct nouveau_fence_chan *fc
return drop; return drop;
} }
static int static void
nouveau_fence_wait_uevent_handler(struct nvif_event *event, void *repv, u32 repc) nouveau_fence_uevent_work(struct work_struct *work)
{ {
struct nouveau_fence_chan *fctx = container_of(event, typeof(*fctx), event); struct nouveau_fence_chan *fctx = container_of(work, struct nouveau_fence_chan,
uevent_work);
unsigned long flags; unsigned long flags;
int ret = NVIF_EVENT_KEEP; int drop = 0;
spin_lock_irqsave(&fctx->lock, flags); spin_lock_irqsave(&fctx->lock, flags);
if (!list_empty(&fctx->pending)) { if (!list_empty(&fctx->pending)) {
@ -160,11 +162,20 @@ nouveau_fence_wait_uevent_handler(struct nvif_event *event, void *repv, u32 repc
fence = list_entry(fctx->pending.next, typeof(*fence), head); fence = list_entry(fctx->pending.next, typeof(*fence), head);
chan = rcu_dereference_protected(fence->channel, lockdep_is_held(&fctx->lock)); chan = rcu_dereference_protected(fence->channel, lockdep_is_held(&fctx->lock));
if (nouveau_fence_update(chan, fctx)) if (nouveau_fence_update(chan, fctx))
ret = NVIF_EVENT_DROP; drop = 1;
} }
spin_unlock_irqrestore(&fctx->lock, flags); if (drop)
nvif_event_block(&fctx->event);
return ret; spin_unlock_irqrestore(&fctx->lock, flags);
}
static int
nouveau_fence_wait_uevent_handler(struct nvif_event *event, void *repv, u32 repc)
{
struct nouveau_fence_chan *fctx = container_of(event, typeof(*fctx), event);
schedule_work(&fctx->uevent_work);
return NVIF_EVENT_KEEP;
} }
void void
@ -178,6 +189,7 @@ nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_cha
} args; } args;
int ret; int ret;
INIT_WORK(&fctx->uevent_work, nouveau_fence_uevent_work);
INIT_LIST_HEAD(&fctx->flip); INIT_LIST_HEAD(&fctx->flip);
INIT_LIST_HEAD(&fctx->pending); INIT_LIST_HEAD(&fctx->pending);
spin_lock_init(&fctx->lock); spin_lock_init(&fctx->lock);

1
drivers/gpu/drm/nouveau/nouveau_fence.h
View File

@ -44,6 +44,7 @@ struct nouveau_fence_chan {
u32 context; u32 context;
char name[32]; char name[32];
struct work_struct uevent_work;
struct nvif_event event; struct nvif_event event;
int notify_ref, dead, killed; int notify_ref, dead, killed;
}; };