From patchwork Thu May 9 19:46:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 2546821 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 35CBDDF24C for ; Thu, 9 May 2013 22:41:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C660E63DC for ; Thu, 9 May 2013 15:41:17 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f43.google.com (mail-pb0-f43.google.com [209.85.160.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F98FE5FD9 for ; Thu, 9 May 2013 12:47:03 -0700 (PDT) Received: by mail-pb0-f43.google.com with SMTP id md12so2224038pbc.30 for ; Thu, 09 May 2013 12:47:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=vCTHEnUYPgYkdJBWZLpUOxg29bhQ46fX8PU4JVDIEEA=; b=aCin3irP+XVmZntoFduauiTxm8gcnCPKqufxu3xuXcJGDaQpE511gho1PbHgsnci/B K96dVBXBc6jWiuJilA5pwvZWZOinVGYJJmzf1nsvq6ZYsSn6ZGpw85lPUmK6ffM125qZ y1oM5Wne6BYIvL4UA8eluAXjCodus1LdBh8zftuCyj6s2gHTEU8+ptPk8g/AgmPQpM0o pbAfrMEoqHuX88Ju1WpOtQKwJv2F8XDGWi2VCLcMYAHAIry38PvbW5H6gav8pgXqK7kI YHS6y0VurNEBWAQ6mEZUDN2/CJyzxiscK8yAbkt7MRs5lQBoFycE/CIuEB00GVqUlDH0 9otA== X-Received: by 10.68.20.42 with SMTP id k10mr13925925pbe.77.1368128823093; Thu, 09 May 2013 12:47:03 -0700 (PDT) Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) by mx.google.com with ESMTPSA id 10sm4128881pbm.0.2013.05.09.12.47.01 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 May 2013 12:47:02 -0700 (PDT) From: Andy Lutomirski To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [RFC/PATCH v2 6/8] radeon: Switch to arch_phys_wc_add and add a missing ..._del Date: Thu, 9 May 2013 12:46:25 -0700 Message-Id: <4823aeff17c92461b40f1e3be03dbd13df78481a.1368128020.git.luto@amacapital.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkzWsoHSj4aV5O++pPZXWmh3twBmAmlFGrL4xxs79W1zmwPKwbLHpXxU/MUVI0Bv/wokk1V X-Mailman-Approved-At: Thu, 09 May 2013 15:36:02 -0700 Cc: Daniel Vetter , Andy Lutomirski X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 Signed-off-by: Andy Lutomirski --- drivers/gpu/drm/radeon/radeon_object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index d3aface..15cd34b 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -321,8 +321,8 @@ void radeon_bo_force_delete(struct radeon_device *rdev) int radeon_bo_init(struct radeon_device *rdev) { /* Add an MTRR for the VRAM */ - rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size, - MTRR_TYPE_WRCOMB, 1); + rdev->mc.vram_mtrr = arch_phys_wc_add(rdev->mc.aper_base, + rdev->mc.aper_size); DRM_INFO("Detected VRAM RAM=%lluM, BAR=%lluM\n", rdev->mc.mc_vram_size >> 20, (unsigned long long)rdev->mc.aper_size >> 20); @@ -334,6 +334,7 @@ int radeon_bo_init(struct radeon_device *rdev) void radeon_bo_fini(struct radeon_device *rdev) { radeon_ttm_fini(rdev); + arch_phys_wc_del(rdev->mc.vram_mtrr); } void radeon_bo_list_add_object(struct radeon_bo_list *lobj,