diff options
| author |   Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-01-29 11:05:09 +0100 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2014-01-30 09:20:28 +1000 |
| commit | 09c3de135063f93d7137ad112f551f293b1204cf (patch) | |
| tree | 7c0e7ac9c56b5b52cf97314033df02a54369da9f /drivers/gpu/drm/nouveau/nouveau_display.c | |
| parent | drm/nouveau: implement hooks for needed for drm vblank timestamping support (diff) | |
| download | linux-dev-09c3de135063f93d7137ad112f551f293b1204cf.tar.xz linux-dev-09c3de135063f93d7137ad112f551f293b1204cf.zip | |
drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
Fixes a regression introduced by d5c1e84b3a130f0
"drm/nouveau: hold mutex while syncing to kernel channel".
Cc: stable@vger.kernel.org #3.13
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 02a65259d8fb..24011596af43 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -722,7 +722,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, ret = nouveau_fence_sync(fence, chan); nouveau_fence_unref(&fence); if (ret) - goto fail_free; + goto fail_unpin; ret = ttm_bo_reserve(&old_bo->bo, true, false, false, NULL); if (ret) |