diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-01-14 16:48:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 13:55:41 -0800 |
| commit | 67ba7bc05ddf1cbc76d4d7dba4f3235011c10d2c (patch) | |
| tree | 9196d2777cfab772bebda9f3324a8e43e0f675bf | |
| parent | c81b99f67cc5046fd2429332e1a945594b62db8a (diff) | |
| download | linux-stable-67ba7bc05ddf1cbc76d4d7dba4f3235011c10d2c.tar.gz linux-stable-67ba7bc05ddf1cbc76d4d7dba4f3235011c10d2c.tar.bz2 linux-stable-67ba7bc05ddf1cbc76d4d7dba4f3235011c10d2c.zip | |
drm/nouveau: hold mutex while syncing to kernel channel
commit d5c1e84b3a130f0743b218b33ff7d9cb493ab5b4 upstream.
Not holding the mutex potentially causes corruption of the kernel
channel when page flipping.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 25ea82f8def3..8b757483a107 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -603,6 +603,14 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, if (!s) return -ENOMEM; + if (new_bo != old_bo) { + ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM); + if (ret) + goto fail_free; + } + + mutex_lock(&chan->cli->mutex); + /* synchronise rendering channel with the kernel's channel */ spin_lock(&new_bo->bo.bdev->fence_lock); fence = nouveau_fence_ref(new_bo->bo.sync_obj); @@ -612,13 +620,6 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, if (ret) goto fail_free; - if (new_bo != old_bo) { - ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM); - if (ret) - goto fail_free; - } - - mutex_lock(&chan->cli->mutex); ret = ttm_bo_reserve(&old_bo->bo, true, false, false, NULL); if (ret) goto fail_unpin; |