From patchwork Tue Feb 1 16:54:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Turner X-Patchwork-Id: 523421 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 p11Gshne019789 for ; Tue, 1 Feb 2011 16:55:05 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3343B9E887 for ; Tue, 1 Feb 2011 08:54:43 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yx0-f177.google.com (mail-yx0-f177.google.com [209.85.213.177]) by gabe.freedesktop.org (Postfix) with ESMTP id DD0799E764 for ; Tue, 1 Feb 2011 08:54:32 -0800 (PST) Received: by yxd30 with SMTP id 30so2645919yxd.36 for ; Tue, 01 Feb 2011 08:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=uwyJDcvlvx2eSw4dfdUnSj7TJsR01+E7+3G+GG/hwAA=; b=e2ivao3AxlwfD1kemHfsg9AqEUgdj4cXJ229nGUS4q89bLjWgnenfZNpdbaDV9FEp3 aa9dLrqrhaLM223soJs9lacAXbXaDbpAT6mai8EZ/0qi4ro0OwW/1lqjKEFdI+fWGS4T XAUm6olVs6FnwMieM6Q0mtDTGYfSLam/mS/Pc= 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=kQRWrGGoHWNi6+vj/f96l9K1FuHYnPDLjlYyc37VmaMms+Bos0/Lf2BvDJY+tNHp/l L28R6cgGc6TwPxk1yrTD7NXFmFKjV2mHC2gHCD8VqQsPcqthXCcb/udC2BlEKkK2AZ8p +AtrVO8uOrx5V+FLsvadQOCpiOMcFsiVoZ5m0= Received: by 10.150.178.1 with SMTP id a1mr6851546ybf.101.1296579272061; Tue, 01 Feb 2011 08:54:32 -0800 (PST) Received: from localhost (cpe-071-070-208-019.nc.res.rr.com [71.70.208.19]) by mx.google.com with ESMTPS id v6sm2787836ybk.20.2011.02.01.08.54.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 01 Feb 2011 08:54:31 -0800 (PST) From: Matt Turner To: Dave Airlie Subject: [PATCH 2/2] amd-k7-agp: remove non-x86 code Date: Tue, 1 Feb 2011 11:54:16 -0500 Message-Id: <1296579256-14777-2-git-send-email-mattst88@gmail.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1296579256-14777-1-git-send-email-mattst88@gmail.com> References: <1296579256-14777-1-git-send-email-mattst88@gmail.com> Cc: Alan Hourihane , dri-devel@lists.freedesktop.org, linux-alpha@vger.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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 01 Feb 2011 16:55:09 +0000 (UTC) diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index b1b4362..45681c0 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c @@ -41,22 +41,8 @@ static int amd_create_page_map(struct amd_page_map *page_map) if (page_map->real == NULL) return -ENOMEM; -#ifndef CONFIG_X86 - SetPageReserved(virt_to_page(page_map->real)); - global_cache_flush(); - page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real), - PAGE_SIZE); - if (page_map->remapped == NULL) { - ClearPageReserved(virt_to_page(page_map->real)); - free_page((unsigned long) page_map->real); - page_map->real = NULL; - return -ENOMEM; - } - global_cache_flush(); -#else set_memory_uc((unsigned long)page_map->real, 1); page_map->remapped = page_map->real; -#endif for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) { writel(agp_bridge->scratch_page, page_map->remapped+i); @@ -68,12 +54,7 @@ static int amd_create_page_map(struct amd_page_map *page_map) static void amd_free_page_map(struct amd_page_map *page_map) { -#ifndef CONFIG_X86 - iounmap(page_map->remapped); - ClearPageReserved(virt_to_page(page_map->real)); -#else set_memory_wb((unsigned long)page_map->real, 1); -#endif free_page((unsigned long) page_map->real); }