From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 May 2014 23:06:21 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~12243^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc
diff --cc drivers/gpu/drm/nouveau/nouveau_display.c
index 3ff030dc1ee3,72e1571393e5..da764a4ed958
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@@ -764,12 -764,12 +764,12 @@@ nouveau_crtc_page_flip(struct drm_crtc 
  	}
  
  	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->fb = fb;
 +	crtc->primary->fb = fb;
  
  	nouveau_bo_fence(old_bo, fence);
  	ttm_bo_unreserve(&old_bo->bo);