From patchwork Tue Jul 31 15:07:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 1260721 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id E1CA1DF26F for ; Tue, 31 Jul 2012 15:08:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BE0439E946 for ; Tue, 31 Jul 2012 08:08:20 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DA6F9E843 for ; Tue, 31 Jul 2012 08:07:22 -0700 (PDT) Received: by mail-qc0-f177.google.com with SMTP id u28so3696239qcs.36 for ; Tue, 31 Jul 2012 08:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=2qqnkQep7Ov+DJ8ssupzVEt+vhyRd0ovU+8QS5nAYyY=; b=fIewFft+QcIbps9i+MhRW/zpcUQwI1Zd180SobZgSwNxTNU0xldVRuDaJGWdW2d0J9 w1b9xQ+nHsjNTF+Cydz6XKaBZYJ0PMbKfgzmi3fkUmzFs8Mss88WWbQFtVOiav+qJ0jG PUaFLoMOLGOVahjq1LpzrhduVVwlVQTWjCrdqto7/8s2JNbVVCQZ9vBqZk6j+GOWkb9Y d4pJckCV0nuN4AMzjnUCzOoC/h6Q0IvfyehtDVEQ5yBL9Gf7pzRpEzKAe0ggIq7tPnby E0XlRuGBk5rS5LLtIqtu/xxtiHFMffARaB67u1jEqb/DVb0fsYtR0khWYYE0V98DIrTp lMRA== Received: by 10.224.184.208 with SMTP id cl16mr30247931qab.39.1343747242315; Tue, 31 Jul 2012 08:07:22 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPS id fx5sm482159qab.14.2012.07.31.08.07.20 (version=SSLv3 cipher=OTHER); Tue, 31 Jul 2012 08:07:21 -0700 (PDT) From: alexdeucher@gmail.com To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/radeon: fix bank tiling parameters on cayman Date: Tue, 31 Jul 2012 11:07:10 -0400 Message-Id: <1343747230-18097-2-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1343747230-18097-1-git-send-email-alexdeucher@gmail.com> References: <1343747230-18097-1-git-send-email-alexdeucher@gmail.com> Cc: Alex Deucher , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 From: Alex Deucher Handle the 16 bank case. Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/ni.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 9945d86..853800e 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -574,10 +574,18 @@ static void cayman_gpu_init(struct radeon_device *rdev) if (rdev->flags & RADEON_IS_IGP) rdev->config.cayman.tile_config |= 1 << 4; else { - if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) - rdev->config.cayman.tile_config |= 1 << 4; - else + switch ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) { + case 0: /* four banks */ rdev->config.cayman.tile_config |= 0 << 4; + break; + case 1: /* eight banks */ + rdev->config.cayman.tile_config |= 1 << 4; + break; + case 2: /* sixteen banks */ + default: + rdev->config.cayman.tile_config |= 2 << 4; + break; + } } rdev->config.cayman.tile_config |= ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8;