From patchwork Thu May 9 19:46:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 2546901 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 578F4DF24C for ; Thu, 9 May 2013 22:42:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D46CE63CA for ; Thu, 9 May 2013 15:42:51 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 1EB58E5FD9 for ; Thu, 9 May 2013 12:47:08 -0700 (PDT) Received: by mail-pd0-f179.google.com with SMTP id q10so2226183pdj.24 for ; Thu, 09 May 2013 12:47:07 -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=kA8NNAc3Nio38AJaT8d+yShrIolQ+l0+mIow6XsTZ/E=; b=WXhKWtDRvepMH3da+XAMtHbXz/kKm6Lf0mh+gLVn5wtUOYcNaC7A/0K8tA7oZ+/tGc HAj5R2lGHmkenMIsoswcQ7pwd6ZzEkchM3qsfLiAptLQzD17o64y0wS9VxVnrT0TQnXg AZrAC/NoTlcC0rt2wy0tkT4ZTs0pjN1pA2iXXRDkafX1aIKfsNtZKM4SDAx0+g9f7UZp qifx7pmrSYQUU5XM6WU7jtUy0ZW3z/ShKebZi20qZ/qZ+v9OaWf8SmyTedWZ0yY1IZ7k NLnk8XqMAhaT5eWEmPuoPRXNGUzx6+BD5q4K/PaVGohVjM3suyP09Kryzm8Gl6wz1hfo wUcg== X-Received: by 10.66.233.167 with SMTP id tx7mr14424755pac.110.1368128827938; Thu, 09 May 2013 12:47:07 -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 k2sm4793895pat.7.2013.05.09.12.47.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 May 2013 12:47:07 -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 8/8] drm: Remove mtrr_add and mtrr_del fallback hack for non-MTRR systems Date: Thu, 9 May 2013 12:46:27 -0700 Message-Id: <20c48ef6c4353a67091f13ed8ff071595b01b9b8.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: ALoCoQmNQM+6aJfj/BGlJyCycrOlHnN7JeIY4IVhBsApjitI1I1fnUwJ1XoURFqdpuvc66rOOOCv 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 There are no users left in drivers/gpu. Signed-off-by: Andy Lutomirski --- This is new in v2. The code I'm deleting is kind of gross. 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)