From patchwork Tue Oct 19 04:36:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 264481 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 o9J4aeBR019744 for ; Tue, 19 Oct 2010 04:37:01 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D0DC19ECE0 for ; Mon, 18 Oct 2010 21:36:39 -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 8C3BE9E753 for ; Mon, 18 Oct 2010 21:36:31 -0700 (PDT) Received: by qwj8 with SMTP id 8so1321222qwj.36 for ; Mon, 18 Oct 2010 21:36:31 -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=GQOiqrzAgZejiY5aDDmF248NSULDYbRboPpTAI0oTuI=; b=MhX7FqwiJsV2rx2Fz4CuLn7fmgGCJOXjzFz12OSx4v4E2fHT7zBhdimLObLh4AQjqf Syeh7gbi0FYjeJ9kjo42Ar3K/iyGxXZRH8zm3ewBX+fSOg/4AfMlnHF4XN2jp1TkY2O7 4Y1yca2J39MBZ/SLL5nBOYP6KP8lk42amRyxE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=c2l0lEZz/SPLReCcANGxNoyszyeW/rrKYRCOaOEQDomie4eJqpm/w/vekBCi0Zr0J9 edX9Pi/Njv4SYEj8VXEzKS1ZFYMvxIzQykbOvXlunJEVjVAcJ4LdJ+rKhaOrnhrqAzp4 LbMpL8aNU0RBhK7V2Xe0PcpojSgyw4RY1kDRQ= Received: by 10.224.215.7 with SMTP id hc7mr3572919qab.67.1287462990965; Mon, 18 Oct 2010 21:36:30 -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 n7sm8489917qcu.16.2010.10.18.21.36.28 (version=SSLv3 cipher=RC4-MD5); Mon, 18 Oct 2010 21:36:28 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: enable unmappable vram for evergreen Date: Tue, 19 Oct 2010 00:36:19 -0400 Message-Id: <1287462979-24832-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.3 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Oct 2010 04:37:01 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c index a9825aa..2eeb29d 100644 --- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c +++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c @@ -499,6 +499,7 @@ done: dev_err(rdev->dev, "(%d) pin blit object failed\n", r); return r; } + rdev->mc.active_vram_size = rdev->mc.real_vram_size; return 0; } @@ -506,6 +507,7 @@ void evergreen_blit_fini(struct radeon_device *rdev) { int r; + rdev->mc.active_vram_size = rdev->mc.visible_vram_size; if (rdev->r600_blit.shader_obj == NULL) return; /* If we can't reserve the bo, unref should be enough to destroy