From patchwork Fri Dec 3 19:37:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 378861 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 oB3JcHKs029343 for ; Fri, 3 Dec 2010 19:38:38 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C035D9E7F9 for ; Fri, 3 Dec 2010 11:38:17 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 74B4F9E7F9 for ; Fri, 3 Dec 2010 11:37:36 -0800 (PST) Received: by mail-vw0-f49.google.com with SMTP id 5so4054059vws.36 for ; Fri, 03 Dec 2010 11:37:36 -0800 (PST) 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:in-reply-to:references; bh=h3S7N/+uwBcXoL5zZ3IgjBk9Q6QiiY3qihyVHpkN8co=; b=e7pmQwLLuivtHzxHn1EDC9vFQ3F8Cdv9UYc7EwxM0kJTetOHu5aRrAZYASoBYDVo4P gGsaHitV9WJv8majUIlLH4/ZQWyKyX7vDVq8Zl/kBr5eSdzZw75r1jvPZQ1/QurMp8sb pof3he1LTQutxo0Ybg0dLgEilO+THoxlkWw9w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Hl3pmzJRuyOV7fYPPPx7A5RxczTTXOCNXd/l7rl04DIeexj5sYtp1hZOJ2eTp/Z/P9 n7ZCYXqbF78D2OpUWvMvyvZoyBUKdpJ0VGJbtsu6Q4nMWrOI7+pq92iAS56biJIfTFYl 0sU8OmDtdHS80F/a1KlT8eXZXc9oaf1F8bXtk= Received: by 10.220.179.72 with SMTP id bp8mr505713vcb.155.1291405056250; Fri, 03 Dec 2010 11:37:36 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id l14sm378245vcr.18.2010.12.03.11.37.34 (version=SSLv3 cipher=RC4-MD5); Fri, 03 Dec 2010 11:37:35 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix vram base calculation on rs780/rs880 Date: Fri, 3 Dec 2010 14:37:22 -0500 Message-Id: <1291405043-22160-2-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1291405043-22160-1-git-send-email-alexdeucher@gmail.com> References: <1291405043-22160-1-git-send-email-alexdeucher@gmail.com> 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]); Fri, 03 Dec 2010 19:38:38 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 53bfe3a..c6a37e0 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1198,8 +1198,10 @@ static void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc mc->vram_end, mc->real_vram_size >> 20); } else { u64 base = 0; - if (rdev->flags & RADEON_IS_IGP) - base = (RREG32(MC_VM_FB_LOCATION) & 0xFFFF) << 24; + if (rdev->flags & RADEON_IS_IGP) { + base = RREG32(MC_VM_FB_LOCATION) & 0xFFFF; + base <<= 24; + } radeon_vram_location(rdev, &rdev->mc, base); rdev->mc.gtt_base_align = 0; radeon_gtt_location(rdev, mc);