From patchwork Mon May 13 23:58:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 2561251 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D7CBF3FD4E for ; Tue, 14 May 2013 00:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755708Ab3ENAA0 (ORCPT ); Mon, 13 May 2013 20:00:26 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:59731 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755688Ab3EMX7P (ORCPT ); Mon, 13 May 2013 19:59:15 -0400 Received: by mail-pb0-f41.google.com with SMTP id xb12so874816pbc.14 for ; Mon, 13 May 2013 16:59:14 -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=6fKz1A9QzIb2POVwbB9yce7joeo1ZfoLyiP0cyrdYWU=; b=cv2HNmp5MNeUW64YjCaygeCoy4Shv7+sxCccBQIt/aQQvooJNzZgkZf5FNBN7n+HXE 1/H9KSGAG4hKOWWtMLf7MB1FXwLroXQklP52d2nKn2EGHzCbeA78QtfpD2HQWNWz4kpV BnFtc3BMANcuWRt8lyamCEwLis5sLJvStAxfnCI8T+GRgK4kiiI9xAneXT83h+tMTD9q y5AcYFeBa2BZkb71LfZvYt3cAioh3GrEFQaMmi6lMT0ia+LFTAHjn7rrvlIqHX3c+Jzy VeCXdU3ZkgN+knseGNZEwm4c5qUVezG0+Gw9/1+h6H366oUE8lEaJDawz596Gdc8CWSw IHow== X-Received: by 10.66.151.46 with SMTP id un14mr32472876pab.14.1368489554848; Mon, 13 May 2013 16:59:14 -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 t1sm16738207pab.12.2013.05.13.16.59.12 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 13 May 2013 16:59:13 -0700 (PDT) From: Andy Lutomirski To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: Daniel Vetter , Jerome Glisse , Alex Deucher , Dave Airlie , Andy Lutomirski Subject: [PATCH v3 6/9] radeon: Switch to arch_phys_wc_add and add a missing ..._del Date: Mon, 13 May 2013 16:58:45 -0700 Message-Id: X-Mailer: git-send-email 1.8.1.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQnM9HyGKjlLyFfwYbYJcFxU+84JtsIjzZvzxt3xUawV5+KXhgR2WoY3wcTKIwlLIPZNidA4 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Reviewed-by: Daniel Vetter Signed-off-by: Andy Lutomirski Reviewed-by: Alex Deucher --- 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,