From patchwork Fri Aug 5 19:41:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 108721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id C4FA2B6F67 for ; Sat, 6 Aug 2011 05:41:50 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QpQH6-0000X5-EC; Fri, 05 Aug 2011 19:41:40 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QpQH5-0000WW-AE for kernel-team@lists.ubuntu.com; Fri, 05 Aug 2011 19:41:39 +0000 Received: from c-69-254-227-224.hsd1.ks.comcast.net ([69.254.227.224] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1QpQH5-00083L-1W for kernel-team@lists.ubuntu.com; Fri, 05 Aug 2011 19:41:39 +0000 From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH][Maverick SRU] drm/nv50-nvc0: work around an evo channel hang that some people see Date: Fri, 5 Aug 2011 14:41:27 -0500 Message-Id: <1312573288-7918-3-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1312573288-7918-1-git-send-email-seth.forshee@canonical.com> References: <1312573288-7918-1-git-send-email-seth.forshee@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@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 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;