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: 2561241 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 60DEF3FD4E for ; Tue, 14 May 2013 00:00:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755761Ab3EMX7x (ORCPT ); Mon, 13 May 2013 19:59:53 -0400 Received: from mail-pb0-f50.google.com ([209.85.160.50]:46899 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755715Ab3EMX7V (ORCPT ); Mon, 13 May 2013 19:59:21 -0400 Received: by mail-pb0-f50.google.com with SMTP id um15so4833704pbc.9 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=EshlF0orcn92Uwq3g7JnpM0Op5E04+vcHkuU5e0Qc6PyS7smoWNHFpR1BfTKtDKNxf SpBX5iN6VYO5W3HThzprHuHzasu8EZjJm3nOcCNH2aRJn/GGdz2X/9UVgKX/yAXSEMzP xhEnmjL5WL7AnmKribSxNc4kLbtQpSyyK05KiQEotEh+cU2OkaFsLIh64ToBmkA7afMj BIwxCoVNL0oEFGdi9D1MqgzEdxCiymTEFutv5juhyCwSl3WplKqFugV2j3KlhrUAnDcN x1e95QR95S8iA6Qq0h2nyFMVg/AqHwt9RKqkZlkfUbQvHnlrpmyTSoqUh78KkJsLj5zu uDog== 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 Cc: Daniel Vetter , Jerome Glisse , Alex Deucher , Dave Airlie , Andy Lutomirski 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: ALoCoQnF7iFtmovyP4vdyGpSAG423GNwe7rDREvW9IsOKvDBKRwOdIEaz/XZUG/M2IQJ51xeHLOa Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.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)