From patchwork Fri Aug 5 19:41:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Lucid, SRU] drm/nv50-nvc0: work around an evo channel hang that some people see Date: Fri, 05 Aug 2011 09:41:26 -0000 From: Seth Forshee X-Patchwork-Id: 108720 Message-Id: <1312573288-7918-2-git-send-email-seth.forshee@canonical.com> To: kernel-team@lists.ubuntu.com From: David Dillow BugLink: http://bugs.launchpad.net/bugs/583760 Signed-off-by: Ben Skeggs (backported from commit 59197c026257ab730c7fc8819a0e2b26e125a534 upstream) Signed-off-by: Seth Forshee --- drivers/gpu/drm/nouveau/nv50_display.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 90f0bf5..72e3048 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -329,6 +329,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;