aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/r128_drm.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-09-25 00:28:13 -0400
committerDave Airlie <airlied@linux.ie>2005-09-25 00:28:13 -0400
commitb5e89ed53ed8d24f83ba1941c07382af00ed238e (patch)
tree747bae7a565f88a2e1d5974776eeb054a932c505 /drivers/char/drm/r128_drm.h
parent99a2657a29e2d623c3568cd86b27cac13fb63140 (diff)
drm: lindent the drm directory.
I've been threatening this for a while, so no point hanging around. This lindents the DRM code which was always really bad in tabbing department. I've also fixed some misnamed files in comments and removed some trailing whitespace. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/r128_drm.h')
-rw-r--r--drivers/char/drm/r128_drm.h32
1 files changed, 15 insertions, 17 deletions
diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
index b616cd3ed2c..5ddc0320241 100644
--- a/drivers/char/drm/r128_drm.h
+++ b/drivers/char/drm/r128_drm.h
@@ -93,7 +93,7 @@
93#define R128_MAX_TEXTURE_LEVELS 11 93#define R128_MAX_TEXTURE_LEVELS 11
94#define R128_MAX_TEXTURE_UNITS 2 94#define R128_MAX_TEXTURE_UNITS 2
95 95
96#endif /* __R128_SAREA_DEFINES__ */ 96#endif /* __R128_SAREA_DEFINES__ */
97 97
98typedef struct { 98typedef struct {
99 /* Context state - can be written in one large chunk */ 99 /* Context state - can be written in one large chunk */
@@ -140,7 +140,6 @@ typedef struct {
140 unsigned int tex_border_color; 140 unsigned int tex_border_color;
141} drm_r128_texture_regs_t; 141} drm_r128_texture_regs_t;
142 142
143
144typedef struct drm_r128_sarea { 143typedef struct drm_r128_sarea {
145 /* The channel for communication of state information to the kernel 144 /* The channel for communication of state information to the kernel
146 * on firing a vertex buffer. 145 * on firing a vertex buffer.
@@ -161,14 +160,13 @@ typedef struct drm_r128_sarea {
161 unsigned int last_frame; 160 unsigned int last_frame;
162 unsigned int last_dispatch; 161 unsigned int last_dispatch;
163 162
164 drm_tex_region_t tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1]; 163 drm_tex_region_t tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS + 1];
165 unsigned int tex_age[R128_NR_TEX_HEAPS]; 164 unsigned int tex_age[R128_NR_TEX_HEAPS];
166 int ctx_owner; 165 int ctx_owner;
167 int pfAllowPageFlip; /* number of 3d windows (0,1,2 or more) */ 166 int pfAllowPageFlip; /* number of 3d windows (0,1,2 or more) */
168 int pfCurrentPage; /* which buffer is being displayed? */ 167 int pfCurrentPage; /* which buffer is being displayed? */
169} drm_r128_sarea_t; 168} drm_r128_sarea_t;
170 169
171
172/* WARNING: If you change any of these defines, make sure to change the 170/* WARNING: If you change any of these defines, make sure to change the
173 * defines in the Xserver file (xf86drmR128.h) 171 * defines in the Xserver file (xf86drmR128.h)
174 */ 172 */
@@ -220,7 +218,7 @@ typedef struct drm_r128_sarea {
220 218
221typedef struct drm_r128_init { 219typedef struct drm_r128_init {
222 enum { 220 enum {
223 R128_INIT_CCE = 0x01, 221 R128_INIT_CCE = 0x01,
224 R128_CLEANUP_CCE = 0x02 222 R128_CLEANUP_CCE = 0x02
225 } func; 223 } func;
226#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) 224#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
@@ -278,9 +276,9 @@ typedef struct drm_r128_clear {
278 276
279typedef struct drm_r128_vertex { 277typedef struct drm_r128_vertex {
280 int prim; 278 int prim;
281 int idx; /* Index of vertex buffer */ 279 int idx; /* Index of vertex buffer */
282 int count; /* Number of vertices in buffer */ 280 int count; /* Number of vertices in buffer */
283 int discard; /* Client finished with buffer? */ 281 int discard; /* Client finished with buffer? */
284} drm_r128_vertex_t; 282} drm_r128_vertex_t;
285 283
286typedef struct drm_r128_indices { 284typedef struct drm_r128_indices {
@@ -288,7 +286,7 @@ typedef struct drm_r128_indices {
288 int idx; 286 int idx;
289 int start; 287 int start;
290 int end; 288 int end;
291 int discard; /* Client finished with buffer? */ 289 int discard; /* Client finished with buffer? */
292} drm_r128_indices_t; 290} drm_r128_indices_t;
293 291
294typedef struct drm_r128_blit { 292typedef struct drm_r128_blit {
@@ -302,10 +300,10 @@ typedef struct drm_r128_blit {
302 300
303typedef struct drm_r128_depth { 301typedef struct drm_r128_depth {
304 enum { 302 enum {
305 R128_WRITE_SPAN = 0x01, 303 R128_WRITE_SPAN = 0x01,
306 R128_WRITE_PIXELS = 0x02, 304 R128_WRITE_PIXELS = 0x02,
307 R128_READ_SPAN = 0x03, 305 R128_READ_SPAN = 0x03,
308 R128_READ_PIXELS = 0x04 306 R128_READ_PIXELS = 0x04
309 } func; 307 } func;
310 int n; 308 int n;
311 int __user *x; 309 int __user *x;
@@ -327,13 +325,13 @@ typedef struct drm_r128_indirect {
327 325
328typedef struct drm_r128_fullscreen { 326typedef struct drm_r128_fullscreen {
329 enum { 327 enum {
330 R128_INIT_FULLSCREEN = 0x01, 328 R128_INIT_FULLSCREEN = 0x01,
331 R128_CLEANUP_FULLSCREEN = 0x02 329 R128_CLEANUP_FULLSCREEN = 0x02
332 } func; 330 } func;
333} drm_r128_fullscreen_t; 331} drm_r128_fullscreen_t;
334 332
335/* 2.3: An ioctl to get parameters that aren't available to the 3d 333/* 2.3: An ioctl to get parameters that aren't available to the 3d
336 * client any other way. 334 * client any other way.
337 */ 335 */
338#define R128_PARAM_IRQ_NR 1 336#define R128_PARAM_IRQ_NR 1
339 337