From: David Dillow <dave@thedillows.org>
Date: Mon, 21 Mar 2011 11:41:47 +0000 (+1000)
Subject: drm/nv50-nvc0: work around an evo channel hang that some people see
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=59197c026257ab730c7fc8819a0e2b26e125a534;p=deliverable%2Flinux.git

drm/nv50-nvc0: work around an evo channel hang that some people see

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

diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c
index a2cfaa691e9b..c8e83c1a4de8 100644
--- a/drivers/gpu/drm/nouveau/nv50_evo.c
+++ b/drivers/gpu/drm/nouveau/nv50_evo.c
@@ -186,6 +186,7 @@ nv50_evo_channel_init(struct nouveau_channel *evo)
 	nv_mask(dev, 0x610028, 0x00000000, 0x00010001 << id);
 
 	evo->dma.max = (4096/4) - 2;
+	evo->dma.max &= ~7;
 	evo->dma.put = 0;
 	evo->dma.cur = evo->dma.put;
 	evo->dma.free = evo->dma.max - evo->dma.cur;