diff options
author | Dave Airlie <airlied@linux.ie> | 2007-11-04 21:50:58 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-02-07 00:09:38 -0500 |
commit | bc5f4523f772cc7629c5c5a46cf4f2a07a5500b8 (patch) | |
tree | 8fa2f5194bb05d7e789e5d24a0fe3a7456568146 /drivers/char/drm/i830_drm.h | |
parent | 8562b3f25d6e23c9d9e48a32672944d1e8a2aa97 (diff) |
drm: run cleanfile across drm tree
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i830_drm.h')
-rw-r--r-- | drivers/char/drm/i830_drm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/i830_drm.h b/drivers/char/drm/i830_drm.h index 968a6d9f9dcb..4b00d2dd4f68 100644 --- a/drivers/char/drm/i830_drm.h +++ b/drivers/char/drm/i830_drm.h | |||
@@ -12,9 +12,9 @@ | |||
12 | #define _I830_DEFINES_ | 12 | #define _I830_DEFINES_ |
13 | 13 | ||
14 | #define I830_DMA_BUF_ORDER 12 | 14 | #define I830_DMA_BUF_ORDER 12 |
15 | #define I830_DMA_BUF_SZ (1<<I830_DMA_BUF_ORDER) | 15 | #define I830_DMA_BUF_SZ (1<<I830_DMA_BUF_ORDER) |
16 | #define I830_DMA_BUF_NR 256 | 16 | #define I830_DMA_BUF_NR 256 |
17 | #define I830_NR_SAREA_CLIPRECTS 8 | 17 | #define I830_NR_SAREA_CLIPRECTS 8 |
18 | 18 | ||
19 | /* Each region is a minimum of 64k, and there are at most 64 of them. | 19 | /* Each region is a minimum of 64k, and there are at most 64 of them. |
20 | */ | 20 | */ |
@@ -58,7 +58,7 @@ | |||
58 | #define I830_UPLOAD_TEXBLEND_MASK 0xf00000 | 58 | #define I830_UPLOAD_TEXBLEND_MASK 0xf00000 |
59 | #define I830_UPLOAD_TEX_PALETTE_N(n) (0x1000000 << (n)) | 59 | #define I830_UPLOAD_TEX_PALETTE_N(n) (0x1000000 << (n)) |
60 | #define I830_UPLOAD_TEX_PALETTE_SHARED 0x4000000 | 60 | #define I830_UPLOAD_TEX_PALETTE_SHARED 0x4000000 |
61 | #define I830_UPLOAD_STIPPLE 0x8000000 | 61 | #define I830_UPLOAD_STIPPLE 0x8000000 |
62 | 62 | ||
63 | /* Indices into buf.Setup where various bits of state are mirrored per | 63 | /* Indices into buf.Setup where various bits of state are mirrored per |
64 | * context and per buffer. These can be fired at the card as a unit, | 64 | * context and per buffer. These can be fired at the card as a unit, |