commit fc772ec48d7d57ef5fb3fe171eae467d3d440bc4
author Ben Skeggs <bskeggs@redhat.com> Mon Jan 31 16:42:28 2011 +1000
committer Ben Skeggs <bskeggs@redhat.com> Fri Feb 25 06:44:25 2011 +1000
tree d81644baa72a0e087ff57e661525d6de59ac9370
parent ea5f2786a0942832f32deb7c507531b766028356

drm/nv50: 0x50 needs semaphore yields too

Evil, evil chipset.  Worst of both worlds.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drivers/gpu/drm/nouveau/nouveau_fence.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 1334868..d820ad2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -330,9 +330,18 @@
 	int ret;
 
 	if (dev_priv->chipset < 0x84) {
-		ret = RING_SPACE(chan, 3);
-		if (ret)
-			return ret;
+		if (dev_priv->chipset < 0x50) {
+			ret = RING_SPACE(chan, 3);
+			if (ret)
+				return ret;
+		} else {
+			ret = RING_SPACE(chan, 5);
+			if (ret)
+				return ret;
+
+			BEGIN_RING(chan, NvSubSw, NV_SW_YIELD, 1);
+			OUT_RING  (chan, 0);
+		}
 
 		BEGIN_RING(chan, NvSubSw, NV_SW_SEMAPHORE_OFFSET, 2);
 		OUT_RING  (chan, sema->mem->start);
@@ -401,7 +410,7 @@
 	int ret;
 
 	if (dev_priv->chipset < 0x84) {
-		ret = RING_SPACE(chan, 4);
+		ret = RING_SPACE(chan, (dev_priv->chipset != 0x50) ? 4 : 6);
 		if (ret)
 			return ret;
 
@@ -409,6 +418,10 @@
 		OUT_RING  (chan, sema->mem->start);
 		BEGIN_RING(chan, NvSubSw, NV_SW_SEMAPHORE_RELEASE, 1);
 		OUT_RING  (chan, 1);
+		if (dev_priv->chipset == 0x50) {
+			BEGIN_RING(chan, NvSubSw, NV_SW_YIELD, 1);
+			OUT_RING  (chan, 0);
+		}
 	} else
 	if (dev_priv->chipset < 0xc0) {
 		/*