From patchwork Thu Sep 9 23:15:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 167901 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 o89NFtHc009886 for ; Thu, 9 Sep 2010 23:16:30 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 36FDB9EFDD for ; Thu, 9 Sep 2010 16:15:55 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qy0-f177.google.com (mail-qy0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B08E9E752 for ; Thu, 9 Sep 2010 16:15:34 -0700 (PDT) Received: by qyk8 with SMTP id 8so2315332qyk.15 for ; Thu, 09 Sep 2010 16:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=l9hV1Y6CmY0MfPDFgYgOKZzLPptgEh8JVgbA19yWZDQ=; b=Hvx2Jje4MB9oM8An7N0x6Z2gJ6kPZEjIRIUIpuPjXNpcsJuqtTo6UC7CGsN5DzY8OE g1onXxVf1ykhNd7rCisKD6gJx14Ku539N899A728B6Ebtu2puv1ZUf5Y93cyrkI1P1pd NEyzJGZ/aZxPcOe3epotidKT99gHYfU9BRPh0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=nqXJOvUGNWNNVATWcKpCrLg3V6ahDd43phd0GUBsECa7uJ7kVYSUycGTCA2K/qOq1T A9WU30fEzY2MbdTtsPqKxIJWXXmdMzo+g9C1va8/Q8+6O4elTjz6lyLS6h8hVJXxlsu2 hQiFBCBN0pkIS5JDCpLyZL1/CMFlIgB71wOa0= Received: by 10.229.96.16 with SMTP id f16mr476005qcn.255.1284074132274; Thu, 09 Sep 2010 16:15:32 -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 r38sm1921913qcs.14.2010.09.09.16.15.30 (version=SSLv3 cipher=RC4-MD5); Thu, 09 Sep 2010 16:15:31 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms/evergreen: fix backend setup Date: Thu, 9 Sep 2010 19:15:23 -0400 Message-Id: <1284074123-3264-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: stable@kernel.org 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.3 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Sep 2010 23:16:30 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index f5430ed..8efffb6 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1195,14 +1195,25 @@ static void evergreen_gpu_init(struct radeon_device *rdev) EVERGREEN_MAX_BACKENDS_MASK)); break; } - } else - gb_backend_map = - evergreen_get_tile_pipe_to_backend_map(rdev, - rdev->config.evergreen.max_tile_pipes, - rdev->config.evergreen.max_backends, - ((EVERGREEN_MAX_BACKENDS_MASK << - rdev->config.evergreen.max_backends) & - EVERGREEN_MAX_BACKENDS_MASK)); + } else { + switch (rdev->family) { + case CHIP_CYPRESS: + case CHIP_HEMLOCK: + gb_backend_map = 0x66442200; + break; + case CHIP_JUNIPER: + gb_backend_map = 0x00006420; + break; + default: + gb_backend_map = + evergreen_get_tile_pipe_to_backend_map(rdev, + rdev->config.evergreen.max_tile_pipes, + rdev->config.evergreen.max_backends, + ((EVERGREEN_MAX_BACKENDS_MASK << + rdev->config.evergreen.max_backends) & + EVERGREEN_MAX_BACKENDS_MASK)); + } + } rdev->config.evergreen.tile_config = gb_addr_config; WREG32(GB_BACKEND_MAP, gb_backend_map);