From patchwork Mon May 13 23:58:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 2563111 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id D942A3FC5A for ; Tue, 14 May 2013 06:37:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D8FCCE602D for ; Mon, 13 May 2013 23:37:40 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B80EE5FAA for ; Mon, 13 May 2013 16:59:21 -0700 (PDT) Received: by mail-pb0-f49.google.com with SMTP id rp2so2164027pbb.36 for ; Mon, 13 May 2013 16:59:21 -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=yhuCD3jsWRJNluwm84gJiuKtYl4xZW3EXAUfcAt7SoU=; b=h/A6nTi9kXkjH9UpWOQemv4o778Jkow1aFlnL3iveHZno35TxmXjpcn2wqISrUWgGC 7SdbZoYfPmt6HK8ciseDwFRy6q91pbZ4GtU0XIobXhA4gBI4Jr6XM7mVeLpuf8zWFF3J HMjLfDV/JXFZajmyqU09YtSZzc2qINPFi1kNg7raq7nN/DWzcGNs1/6HVI83xESkoghF Fl0ZD4uzLV4aCX2902jiJt1JQLtANVynW9hzFapNdAGtJs+IS0G2FDW/GXugjjCdyNZ/ t88LiwhcvknYwrtPqXy2BRNdm1UElr6EV8xX2bFAj8de1QClOCvYx/MP++qh/Vo9uy35 OJ2Q== X-Received: by 10.66.26.47 with SMTP id i15mr31684734pag.98.1368489561294; Mon, 13 May 2013 16:59:21 -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 ih1sm15661445pbb.44.2013.05.13.16.59.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 13 May 2013 16:59:20 -0700 (PDT) From: Andy Lutomirski To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v3 8/9] drm: Remove mtrr_add and mtrr_del fallback hack for non-MTRR systems Date: Mon, 13 May 2013 16:58:47 -0700 Message-Id: <59d447ca22519276803d6b12b5ce125e8cb77c19.1368485053.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: ALoCoQkvurJY5HSFz1scH7NF0mS80fK4UEl6Wog7IlXbRr2lE7vys1JCzlKtXQe8HVWD1jyzuleX X-Mailman-Approved-At: Mon, 13 May 2013 23:16:39 -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 There are no users left in drivers/gpu. Reviewed-by: Daniel Vetter Signed-off-by: Andy Lutomirski --- include/drm/drmP.h | 5 +---- include/drm/drm_os_linux.h | 16 ---------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 3e6cfa0..7a9fef5 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -55,16 +55,13 @@ #include #include #include +#include #include #if defined(__alpha__) || defined(__powerpc__) #include /* For pte_wrprotect */ #endif -#include #include #include -#ifdef CONFIG_MTRR -#include -#endif #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) #include #include diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h index 3933691..35c7c2b 100644 --- a/include/drm/drm_os_linux.h +++ b/include/drm/drm_os_linux.h @@ -65,22 +65,6 @@ struct no_agp_kern { #define DRM_AGP_KERN struct no_agp_kern #endif -#if !(__OS_HAS_MTRR) -static __inline__ int mtrr_add(unsigned long base, unsigned long size, - unsigned int type, char increment) -{ - return -ENODEV; -} - -static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) -{ - return -ENODEV; -} - -#define MTRR_TYPE_WRCOMB 1 - -#endif - /** Other copying of data to kernel space */ #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ copy_from_user(arg1, arg2, arg3)