Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
one nouveau regression fix * 'linux-4.15' of git://github.com/skeggsb/linux: drm/nouveau: fix race when adding delayed work items
This commit is contained in:
commit
e100ff380c
@ -152,9 +152,9 @@ nouveau_cli_work_queue(struct nouveau_cli *cli, struct dma_fence *fence,
|
||||
work->cli = cli;
|
||||
mutex_lock(&cli->lock);
|
||||
list_add_tail(&work->head, &cli->worker);
|
||||
mutex_unlock(&cli->lock);
|
||||
if (dma_fence_add_callback(fence, &work->cb, nouveau_cli_work_fence))
|
||||
nouveau_cli_work_fence(fence, &work->cb);
|
||||
mutex_unlock(&cli->lock);
|
||||
}
|
||||
|
||||
static void
|
||||
|
Loading…
Reference in New Issue
Block a user