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

drm: remove XFREE86_VERSION macros.

These are no longer needed or being used.

Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

Dave Airlie and committed by
Dave Airlie b589ee59 6c340eac

+1 -42
+1 -19
drivers/char/drm/drm.h
··· 63 63 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) 64 64 #endif 65 65 66 - #define XFREE86_VERSION(major,minor,patch,snap) \ 67 - ((major << 16) | (minor << 8) | patch) 68 - 69 - #ifndef CONFIG_XFREE86_VERSION 70 - #define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0) 71 - #endif 72 - 73 - #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) 74 - #define DRM_PROC_DEVICES "/proc/devices" 75 - #define DRM_PROC_MISC "/proc/misc" 76 - #define DRM_PROC_DRM "/proc/drm" 77 - #define DRM_DEV_DRM "/dev/drm" 78 - #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) 79 - #define DRM_DEV_UID 0 80 - #define DRM_DEV_GID 0 81 - #endif 82 - 83 - #if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0) 84 66 #define DRM_MAJOR 226 85 67 #define DRM_MAX_MINOR 15 86 - #endif 68 + 87 69 #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ 88 70 #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ 89 71 #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */
-5
drivers/char/drm/i810_drm.h
··· 102 102 /* This is the init structure after v1.2 */ 103 103 typedef struct _drm_i810_init { 104 104 drm_i810_init_func_t func; 105 - #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) 106 - int ring_map_idx; 107 - int buffer_map_idx; 108 - #else 109 105 unsigned int mmio_offset; 110 106 unsigned int buffers_offset; 111 - #endif 112 107 int sarea_priv_offset; 113 108 unsigned int ring_start; 114 109 unsigned int ring_end;
-18
drivers/char/drm/r128_drm.h
··· 222 222 R128_INIT_CCE = 0x01, 223 223 R128_CLEANUP_CCE = 0x02 224 224 } func; 225 - #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) 226 - int sarea_priv_offset; 227 - #else 228 225 unsigned long sarea_priv_offset; 229 - #endif 230 226 int is_pci; 231 227 int cce_mode; 232 228 int cce_secure; ··· 236 240 unsigned int depth_offset, depth_pitch; 237 241 unsigned int span_offset; 238 242 239 - #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) 240 - unsigned int fb_offset; 241 - unsigned int mmio_offset; 242 - unsigned int ring_offset; 243 - unsigned int ring_rptr_offset; 244 - unsigned int buffers_offset; 245 - unsigned int agp_textures_offset; 246 - #else 247 243 unsigned long fb_offset; 248 244 unsigned long mmio_offset; 249 245 unsigned long ring_offset; 250 246 unsigned long ring_rptr_offset; 251 247 unsigned long buffers_offset; 252 248 unsigned long agp_textures_offset; 253 - #endif 254 249 } drm_r128_init_t; 255 250 256 251 typedef struct drm_r128_cce_stop { ··· 251 264 252 265 typedef struct drm_r128_clear { 253 266 unsigned int flags; 254 - #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) 255 - int x, y, w, h; 256 - #endif 257 267 unsigned int clear_color; 258 268 unsigned int clear_depth; 259 - #if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0) 260 269 unsigned int color_mask; 261 270 unsigned int depth_mask; 262 - #endif 263 271 } drm_r128_clear_t; 264 272 265 273 typedef struct drm_r128_vertex {