Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b589ee5943a9610ebaea6e4e3433f2ae4d812b0b

Authored by Dave Airlie
Committed by Dave Airlie
1 parent 6c340eac02
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

drm: remove XFREE86_VERSION macros. 

These are no longer needed or being used.

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

Showing 3 changed files with 1 additions and 42 deletions Side-by-side Diff

drivers/char/drm/drm.h
Diff comments   View file @ b589ee5
... ... @@ -63,27 +63,9 @@
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 */
drivers/char/drm/i810_drm.h
Diff comments   View file @ b589ee5
... ... @@ -102,13 +102,8 @@
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;
drivers/char/drm/r128_drm.h
Diff comments   View file @ b589ee5
... ... @@ -222,11 +222,7 @@
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;
233 229  
... ... @@ -240,21 +236,12 @@
240 236 unsigned int depth_offset, depth_pitch;
241 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 239 unsigned long fb_offset;
252 240 unsigned long mmio_offset;
253 241 unsigned long ring_offset;
254 242 unsigned long ring_rptr_offset;
255 243 unsigned long buffers_offset;
256 244 unsigned long agp_textures_offset;
257   -#endif
258 245 } drm_r128_init_t;
259 246  
260 247 typedef struct drm_r128_cce_stop {
261 248  
262 249  
... ... @@ -264,15 +251,10 @@
264 251  
265 252 typedef struct drm_r128_clear {
266 253 unsigned int flags;
267   -#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
268   - int x, y, w, h;
269   -#endif
270 254 unsigned int clear_color;
271 255 unsigned int clear_depth;
272   -#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
273 256 unsigned int color_mask;
274 257 unsigned int depth_mask;
275   -#endif
276 258 } drm_r128_clear_t;
277 259  
278 260 typedef struct drm_r128_vertex {