diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-12-27 09:58:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-12-27 09:58:57 +1000 |
| commit | e100ff380ce936fc1e7ae8ba16621ddf5dddffcb (patch) | |
| tree | 919fe4d6e28e92f4529a03b95c28b8dc6784c73a /drivers/gpu/drm/nouveau | |
| parent | 464e1d5f23cca236b930ef068c328a64cab78fb1 (diff) | |
| parent | b26a2319be3dd26edb3013504992a037a5902520 (diff) | |
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
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 8d4a5be3b913..56fe261b6268 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -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 |