diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-05-07 09:06:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-05-07 09:06:21 +1000 |
| commit | 2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc (patch) | |
| tree | 090be55eb5cd2156b3b8228a0f0251fff330f74a /drivers/gpu/drm/nouveau/nouveau_display.c | |
| parent | 508200c5c076b20436a04cb264168095fe1b1f1a (diff) | |
| parent | c7e74306632c71398ce6db878cd316cb43072ffb (diff) | |
| download | blackbird-op-linux-2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc.tar.gz blackbird-op-linux-2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc.zip | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
nouveau fixes.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/gm107/gr: bump attrib cb size quite a bit
drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip
drm/nouveau/bios: fix shadowing from PROM on big-endian systems
drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.c')
| -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 3ff030dc1ee3..da764a4ed958 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -764,9 +764,9 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, } ret = nouveau_page_flip_emit(chan, old_bo, new_bo, s, &fence); - mutex_unlock(&chan->cli->mutex); if (ret) goto fail_unreserve; + mutex_unlock(&chan->cli->mutex); /* Update the crtc struct and cleanup */ crtc->primary->fb = fb; |
