From patchwork Fri May 20 16:35:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 804162 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4KGZiST031566 for ; Fri, 20 May 2011 16:36:05 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B40BB9ED77 for ; Fri, 20 May 2011 09:35:43 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qy0-f170.google.com (mail-qy0-f170.google.com [209.85.216.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 43F7D9EAF4 for ; Fri, 20 May 2011 09:35:34 -0700 (PDT) Received: by qyk32 with SMTP id 32so428460qyk.15 for ; Fri, 20 May 2011 09:35:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=u6Uddb8WlEa1Ml8nLMNPbWwAjpPm/BijPpSOiDt1KPM=; b=KNAfsach+C27DoGZSaJJMHKwq0vmWqDr4zEnBX3jH1at7ThKsUp+Boreyq1caHaPHY vGfbxXrBKVmz58S8F3Sq+OTdt6OVEAPnAAfdhaMZOUFj49MKEyw8fVoA6RNDCIwBjzYA jWskPjdEXcnRQKAAm92fGCbxCbcuq0zL9FlMo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=fr+kdHfmwIxptatP64h+jhKQ8vLV8rFy2XLCkRusntQMCt12jYOkbxHtrpZc40BPrb aF7/wFvYvDEDaFuFp8ZwmNJwMFNU1Cs8MR/mH+7cDwkLHpOEp5nyaFdpKV3AeqULcs74 ef1N+Gy3GlOV3cNLtFMuwy5O9jKJyo57fD38A= Received: by 10.229.45.1 with SMTP id c1mr3439766qcf.259.1305909333511; Fri, 20 May 2011 09:35:33 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id m9sm2335623qcu.27.2011.05.20.09.35.32 (version=SSLv3 cipher=OTHER); Fri, 20 May 2011 09:35:33 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/radeon/kms: properly set num banks for fusion asics Date: Fri, 20 May 2011 12:35:22 -0400 Message-Id: <1305909323-22051-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 20 May 2011 16:36:05 +0000 (UTC) Needed by userspace for 2D tiled buffer alignment Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/evergreen.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 296e6ec..7c37638 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1936,8 +1936,12 @@ static void evergreen_gpu_init(struct radeon_device *rdev) rdev->config.evergreen.tile_config |= (3 << 0); break; } - rdev->config.evergreen.tile_config |= - ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; + /* num banks is 8 on all fusion asics */ + if (rdev->flags & RADEON_IS_IGP) + rdev->config.evergreen.tile_config |= 8 << 4; + else + rdev->config.evergreen.tile_config |= + ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; rdev->config.evergreen.tile_config |= ((mc_arb_ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT) << 8; rdev->config.evergreen.tile_config |=