diff options
author | Dave Airlie <airlied@redhat.com> | 2007-08-28 01:16:47 -0400 |
---|---|---|
committer | Dave Airlie <airlied@optimus.(none)> | 2007-10-14 20:38:20 -0400 |
commit | b589ee5943a9610ebaea6e4e3433f2ae4d812b0b (patch) | |
tree | d33075004132cf1deeb3fb172bd0e6c82cfcb2ec /drivers/char/drm | |
parent | 6c340eac0285f3d62406d2d902d0e96fbf2a5dc0 (diff) |
drm: remove XFREE86_VERSION macros.
These are no longer needed or being used.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/char/drm')
-rw-r--r-- | drivers/char/drm/drm.h | 20 | ||||
-rw-r--r-- | drivers/char/drm/i810_drm.h | 5 | ||||
-rw-r--r-- | drivers/char/drm/r128_drm.h | 18 |
3 files changed, 1 insertions, 42 deletions
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 2d6f2d0bd02..82fb3d0d278 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h | |||
@@ -63,27 +63,9 @@ | |||
63 | #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) | 63 | #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) |
64 | #endif | 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 | #define DRM_MAJOR 226 | 66 | #define DRM_MAJOR 226 |
85 | #define DRM_MAX_MINOR 15 | 67 | #define DRM_MAX_MINOR 15 |
86 | #endif | 68 | |
87 | #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ | 69 | #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ |
88 | #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ | 70 | #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ |
89 | #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ | 71 | #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ |
diff --git a/drivers/char/drm/i810_drm.h b/drivers/char/drm/i810_drm.h index 614977dbce4..7a10bb6f2c0 100644 --- a/drivers/char/drm/i810_drm.h +++ b/drivers/char/drm/i810_drm.h | |||
@@ -102,13 +102,8 @@ typedef enum _drm_i810_init_func { | |||
102 | /* This is the init structure after v1.2 */ | 102 | /* This is the init structure after v1.2 */ |
103 | typedef struct _drm_i810_init { | 103 | typedef struct _drm_i810_init { |
104 | drm_i810_init_func_t func; | 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 | unsigned int mmio_offset; | 105 | unsigned int mmio_offset; |
110 | unsigned int buffers_offset; | 106 | unsigned int buffers_offset; |
111 | #endif | ||
112 | int sarea_priv_offset; | 107 | int sarea_priv_offset; |
113 | unsigned int ring_start; | 108 | unsigned int ring_start; |
114 | unsigned int ring_end; | 109 | unsigned int ring_end; |
diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h index e94a39c6e32..8d8878b55f5 100644 --- a/drivers/char/drm/r128_drm.h +++ b/drivers/char/drm/r128_drm.h | |||
@@ -222,11 +222,7 @@ typedef struct drm_r128_init { | |||
222 | R128_INIT_CCE = 0x01, | 222 | R128_INIT_CCE = 0x01, |
223 | R128_CLEANUP_CCE = 0x02 | 223 | R128_CLEANUP_CCE = 0x02 |
224 | } func; | 224 | } func; |
225 | #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) | ||
226 | int sarea_priv_offset; | ||
227 | #else | ||
228 | unsigned long sarea_priv_offset; | 225 | unsigned long sarea_priv_offset; |
229 | #endif | ||
230 | int is_pci; | 226 | int is_pci; |
231 | int cce_mode; | 227 | int cce_mode; |
232 | int cce_secure; | 228 | int cce_secure; |
@@ -240,21 +236,12 @@ typedef struct drm_r128_init { | |||
240 | unsigned int depth_offset, depth_pitch; | 236 | unsigned int depth_offset, depth_pitch; |
241 | unsigned int span_offset; | 237 | unsigned int span_offset; |
242 | 238 | ||
243 | #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) | ||
244 | unsigned int fb_offset; | ||
245 | unsigned int mmio_offset; | ||
246 | unsigned int ring_offset; | ||
247 | unsigned int ring_rptr_offset; | ||
248 | unsigned int buffers_offset; | ||
249 | unsigned int agp_textures_offset; | ||
250 | #else | ||
251 | unsigned long fb_offset; | 239 | unsigned long fb_offset; |
252 | unsigned long mmio_offset; | 240 | unsigned long mmio_offset; |
253 | unsigned long ring_offset; | 241 | unsigned long ring_offset; |
254 | unsigned long ring_rptr_offset; | 242 | unsigned long ring_rptr_offset; |
255 | unsigned long buffers_offset; | 243 | unsigned long buffers_offset; |
256 | unsigned long agp_textures_offset; | 244 | unsigned long agp_textures_offset; |
257 | #endif | ||
258 | } drm_r128_init_t; | 245 | } drm_r128_init_t; |
259 | 246 | ||
260 | typedef struct drm_r128_cce_stop { | 247 | typedef struct drm_r128_cce_stop { |
@@ -264,15 +251,10 @@ typedef struct drm_r128_cce_stop { | |||
264 | 251 | ||
265 | typedef struct drm_r128_clear { | 252 | typedef struct drm_r128_clear { |
266 | unsigned int flags; | 253 | unsigned int flags; |
267 | #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) | ||
268 | int x, y, w, h; | ||
269 | #endif | ||
270 | unsigned int clear_color; | 254 | unsigned int clear_color; |
271 | unsigned int clear_depth; | 255 | unsigned int clear_depth; |
272 | #if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0) | ||
273 | unsigned int color_mask; | 256 | unsigned int color_mask; |
274 | unsigned int depth_mask; | 257 | unsigned int depth_mask; |
275 | #endif | ||
276 | } drm_r128_clear_t; | 258 | } drm_r128_clear_t; |
277 | 259 | ||
278 | typedef struct drm_r128_vertex { | 260 | typedef struct drm_r128_vertex { |