Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03dae7c5 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Dave Airlie
Browse files

drm: Remove mtrr_add and mtrr_del fallback hack for non-MTRR systems 



There are no users left in drivers/gpu.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 63e28a7a

include/drm/drmP.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -55,16 +55,13 @@ 
#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/cdev.h>

#include <linux/cdev.h>

#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/slab.h>

#if defined(__alpha__) || defined(__powerpc__)

#if defined(__alpha__) || defined(__powerpc__)

#include <asm/pgtable.h>	/* For pte_wrprotect */

#include <asm/pgtable.h>	/* For pte_wrprotect */

#endif

#endif

#include <asm/io.h>

#include <asm/mman.h>

#include <asm/mman.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>

#ifdef CONFIG_MTRR

#include <asm/mtrr.h>

#endif

#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)

#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)

#include <linux/types.h>

#include <linux/types.h>

#include <linux/agp_backend.h>

#include <linux/agp_backend.h>

include/drm/drm_os_linux.h

+0 −16
Original line number Original line Diff line number Diff line
@@ -65,22 +65,6 @@ struct no_agp_kern { 
#define DRM_AGP_KERN            struct no_agp_kern

#define DRM_AGP_KERN            struct no_agp_kern

#endif

#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 */

/** Other copying of data to kernel space */

#define DRM_COPY_FROM_USER(arg1, arg2, arg3)		\

#define DRM_COPY_FROM_USER(arg1, arg2, arg3)		\

	copy_from_user(arg1, arg2, arg3)

	copy_from_user(arg1, arg2, arg3)