Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

There are no users left in drivers/gpu.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

Andy Lutomirski and committed by
Dave Airlie
03dae7c5 63e28a7a

+1 -20
+1 -4
include/drm/drmP.h
··· 55 55 #include <linux/mm.h> 56 56 #include <linux/cdev.h> 57 57 #include <linux/mutex.h> 58 + #include <linux/io.h> 58 59 #include <linux/slab.h> 59 60 #if defined(__alpha__) || defined(__powerpc__) 60 61 #include <asm/pgtable.h> /* For pte_wrprotect */ 61 62 #endif 62 - #include <asm/io.h> 63 63 #include <asm/mman.h> 64 64 #include <asm/uaccess.h> 65 - #ifdef CONFIG_MTRR 66 - #include <asm/mtrr.h> 67 - #endif 68 65 #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) 69 66 #include <linux/types.h> 70 67 #include <linux/agp_backend.h>
-16
include/drm/drm_os_linux.h
··· 65 65 #define DRM_AGP_KERN struct no_agp_kern 66 66 #endif 67 67 68 - #if !(__OS_HAS_MTRR) 69 - static __inline__ int mtrr_add(unsigned long base, unsigned long size, 70 - unsigned int type, char increment) 71 - { 72 - return -ENODEV; 73 - } 74 - 75 - static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) 76 - { 77 - return -ENODEV; 78 - } 79 - 80 - #define MTRR_TYPE_WRCOMB 1 81 - 82 - #endif 83 - 84 68 /** Other copying of data to kernel space */ 85 69 #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ 86 70 copy_from_user(arg1, arg2, arg3)