From patchwork Mon Oct 25 23:44:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 280272 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 o9PNiJIZ006680 for ; Mon, 25 Oct 2010 23:44:39 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 723779EF58 for ; Mon, 25 Oct 2010 16:44:18 -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 4AC499E80F for ; Mon, 25 Oct 2010 16:44:09 -0700 (PDT) Received: by qwh6 with SMTP id 6so1995403qwh.36 for ; Mon, 25 Oct 2010 16:44:08 -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=UdRiPDoMzTdzFMUpev5l0Na1VzwCxfPXJ7U6vGLp4Ao=; b=xOBj1drwGi2S8U1RN1DKu+VcBe5SMWaz66Lt1niuJ1PkceJLoMhqmRZiUoIVpJ3uxO is+bkFskkoAOHeHEDtfEDru5IuSSYc1HJNDEAx/Y60KVthk9wJvHRQ5ITM2BbDYrei5u JjLgSMKHxBnedru//O5T0TID8k0NRC+NBKMEI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=FO11P4McjwjwEl7Be/vTaTrw1tjC5QsT8cWDIvJATrOYFnTr0TrPPF6n7vQJuPykdm xGZB0c5GsP851tYm3hZjpT+36fMHV5ldwJPTym0LQciwMwLDQQ1tuemxZFURiHjFrVpV oYr2u0WxBHUjiCJNmN3KURSJHU0Srv4/a1yTc= Received: by 10.229.189.83 with SMTP id dd19mr6958779qcb.92.1288050248456; Mon, 25 Oct 2010 16:44:08 -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 t35sm6639881qco.18.2010.10.25.16.44.07 (version=SSLv3 cipher=RC4-MD5); Mon, 25 Oct 2010 16:44:07 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: MC vram map needs to be >= pci aperture size Date: Mon, 25 Oct 2010 19:44:00 -0400 Message-Id: <1288050240-3517-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]); Mon, 25 Oct 2010 23:44:39 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index da69db9..f2155bc 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2326,6 +2326,9 @@ void r100_vram_init_sizes(struct radeon_device *rdev) /* Fix for RN50, M6, M7 with 8/16/32(??) MBs of VRAM - * Novell bug 204882 + along with lots of ubuntu ones */ + if (rdev->mc.aper_size > config_aper_size) + config_aper_size = rdev->mc.aper_size; + if (config_aper_size > rdev->mc.real_vram_size) rdev->mc.mc_vram_size = config_aper_size; else