From patchwork Fri Jul 1 17:18:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 936942 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p61HIjeM032673 for ; Fri, 1 Jul 2011 17:19:06 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 317D89EBC9 for ; Fri, 1 Jul 2011 10:18:45 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qw0-f49.google.com (mail-qw0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 98BB39E7A8 for ; Fri, 1 Jul 2011 10:18:35 -0700 (PDT) Received: by qwi2 with SMTP id 2so2093003qwi.36 for ; Fri, 01 Jul 2011 10:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=xZ1O3d2aAZcPc48EFF+v20DUDs4WjF2++p4pADSS8Ug=; b=XvKacKBD2eNxD3HksVrmQV7Hm551dtccLE/Ec07vStKtssnGkA5QxD4A3qNGk7rVHO sR0Q+ZFWDqolfpd5A7yA89BCaO8/erO5hZajvRIO2c4HVca+ZwIeJBER4ylqGP8hORFh PTZXFIPpz5kcDeU8AqsuB7cMa9ToO/f/ORuBU= Received: by 10.224.176.141 with SMTP id be13mr2893520qab.227.1309540714583; Fri, 01 Jul 2011 10:18:34 -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 l36sm2703594qck.19.2011.07.01.10.18.33 (version=SSLv3 cipher=OTHER); Fri, 01 Jul 2011 10:18:33 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: use correct reg on fusion when reading back mem config Date: Fri, 1 Jul 2011 13:18:28 -0400 Message-Id: <1309540708-24712-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 (demeter2.kernel.org [140.211.167.43]); Fri, 01 Jul 2011 17:19:06 +0000 (UTC) Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/evergreen.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 12d2fdc..e8a5ffb 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2248,7 +2248,10 @@ int evergreen_mc_init(struct radeon_device *rdev) /* Get VRAM informations */ rdev->mc.vram_is_ddr = true; - tmp = RREG32(MC_ARB_RAMCFG); + if (rdev->flags & RADEON_IS_IGP) + tmp = RREG32(FUS_MC_ARB_RAMCFG); + else + tmp = RREG32(MC_ARB_RAMCFG); if (tmp & CHANSIZE_OVERRIDE) { chansize = 16; } else if (tmp & CHANSIZE_MASK) {