diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-12-22 17:54:28 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-12-22 17:56:59 -0500 |
| commit | b26a2319be3dd26edb3013504992a037a5902520 (patch) | |
| tree | 06a2459912091f94952ccc308a89143a32d42d0f | |
| parent | 4ef928929987c19fff4d3c1650f139560ba1cc13 (diff) | |
drm/nouveau: fix race when adding delayed work items
kernel.org bz#198221.
Reported-by: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -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, | |||
| 152 | work->cli = cli; | 152 | work->cli = cli; |
| 153 | mutex_lock(&cli->lock); | 153 | mutex_lock(&cli->lock); |
| 154 | list_add_tail(&work->head, &cli->worker); | 154 | list_add_tail(&work->head, &cli->worker); |
| 155 | mutex_unlock(&cli->lock); | ||
| 156 | if (dma_fence_add_callback(fence, &work->cb, nouveau_cli_work_fence)) | 155 | if (dma_fence_add_callback(fence, &work->cb, nouveau_cli_work_fence)) |
| 157 | nouveau_cli_work_fence(fence, &work->cb); | 156 | nouveau_cli_work_fence(fence, &work->cb); |
| 157 | mutex_unlock(&cli->lock); | ||
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | static void | 160 | static void |
