Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
parents 464e1d5f b26a2319

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -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