Patchwork [Maverick,SRU] drm/nv50-nvc0: work around an evo channel hang that some people see

login
register
mail settings
Submitter Seth Forshee
Date Aug. 5, 2011, 7:41 p.m.
Message ID <1312573288-7918-3-git-send-email-seth.forshee@canonical.com>
Download mbox | patch
Permalink /patch/108721/
State New
Headers show

Comments

Seth Forshee - Aug. 5, 2011, 7:41 p.m.
From: David Dillow <dave@thedillows.org>

BugLink: http://bugs.launchpad.net/bugs/583760

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
(backported from commit 59197c026257ab730c7fc8819a0e2b26e125a534 upstream)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 drivers/gpu/drm/nouveau/nv50_display.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Patch

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 1a4408b..4932585 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -330,6 +330,7 @@  nv50_display_init(struct drm_device *dev)
 	nv_wr32(dev, 0x610300, nv_rd32(dev, 0x610300) & ~1);
 
 	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;