1 files changed, 32 insertions, 29 deletions

diff --git a/drivers/char/drm/savage_drv.h b/drivers/char/drm/savage_drv.h
index a45434944658..a4b0fa998a95 100644
--- a/drivers/char/drm/savage_drv.h
+++ b/drivers/char/drm/savage_drv.h
@@ -65,7 +65,7 @@ typedef struct drm_savage_dma_page {
         drm_savage_age_t age;
         unsigned int used, flushed;
 } drm_savage_dma_page_t;
-#define SAVAGE_DMA_PAGE_SIZE 1024 /* in dwords */
+#define SAVAGE_DMA_PAGE_SIZE 1024       /* in dwords */
 /* Fake DMA buffer size in bytes. 4 pages. Allows a maximum command
  * size of 16kbytes or 4k entries. Minimum requirement would be
  * 10kbytes for 255 40-byte vertices in one drawing command. */
@@ -104,6 +104,9 @@ enum savage_family {
         S3_LAST
 };
 
+extern drm_ioctl_desc_t savage_ioctls[];
+extern int savage_max_ioctl;
+
 #define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
 
 #define S3_SAVAGE4_SERIES(chip)  ((chip==S3_SAVAGE4)            \
@@ -184,13 +187,13 @@ typedef struct drm_savage_private {
         unsigned int waiting;
 
         /* config/hardware-dependent function pointers */
-        int (*wait_fifo)(struct drm_savage_private *dev_priv, unsigned int n);
-        int (*wait_evnt)(struct drm_savage_private *dev_priv, uint16_t e);
+        int (*wait_fifo) (struct drm_savage_private * dev_priv, unsigned int n);
+        int (*wait_evnt) (struct drm_savage_private * dev_priv, uint16_t e);
         /* Err, there is a macro wait_event in include/linux/wait.h.
          * Avoid unwanted macro expansion. */
-        void (*emit_clip_rect)(struct drm_savage_private *dev_priv,
-                               drm_clip_rect_t *pbox);
-        void (*dma_flush)(struct drm_savage_private *dev_priv);
+        void (*emit_clip_rect) (struct drm_savage_private * dev_priv,
+                                drm_clip_rect_t * pbox);
+        void (*dma_flush) (struct drm_savage_private * dev_priv);
 } drm_savage_private_t;
 
 /* ioctls */
@@ -198,23 +201,23 @@ extern int savage_bci_cmdbuf(DRM_IOCTL_ARGS);
 extern int savage_bci_buffers(DRM_IOCTL_ARGS);
 
 /* BCI functions */
-extern uint16_t savage_bci_emit_event(drm_savage_private_t *dev_priv,
+extern uint16_t savage_bci_emit_event(drm_savage_private_t * dev_priv,
                                       unsigned int flags);
-extern void savage_freelist_put(drm_device_t *dev, drm_buf_t *buf);
-extern void savage_dma_reset(drm_savage_private_t *dev_priv);
-extern void savage_dma_wait(drm_savage_private_t *dev_priv, unsigned int page);
-extern uint32_t *savage_dma_alloc(drm_savage_private_t *dev_priv,
+extern void savage_freelist_put(drm_device_t * dev, drm_buf_t * buf);
+extern void savage_dma_reset(drm_savage_private_t * dev_priv);
+extern void savage_dma_wait(drm_savage_private_t * dev_priv, unsigned int page);
+extern uint32_t *savage_dma_alloc(drm_savage_private_t * dev_priv,
                                   unsigned int n);
-extern int savage_preinit(drm_device_t *dev, unsigned long chipset);
-extern int savage_postcleanup(drm_device_t *dev);
-extern int savage_do_cleanup_bci(drm_device_t *dev);
-extern void savage_reclaim_buffers(drm_device_t *dev, DRMFILE filp);
+extern int savage_preinit(drm_device_t * dev, unsigned long chipset);
+extern int savage_postcleanup(drm_device_t * dev);
+extern int savage_do_cleanup_bci(drm_device_t * dev);
+extern void savage_reclaim_buffers(drm_device_t * dev, DRMFILE filp);
 
 /* state functions */
-extern void savage_emit_clip_rect_s3d(drm_savage_private_t *dev_priv,
-                                      drm_clip_rect_t *pbox);
-extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
-                                     drm_clip_rect_t *pbox);
+extern void savage_emit_clip_rect_s3d(drm_savage_private_t * dev_priv,
+                                      drm_clip_rect_t * pbox);
+extern void savage_emit_clip_rect_s4(drm_savage_private_t * dev_priv,
+                                     drm_clip_rect_t * pbox);
 
 #define SAVAGE_FB_SIZE_S3       0x01000000      /*  16MB */
 #define SAVAGE_FB_SIZE_S4       0x02000000      /*  32MB */
@@ -222,10 +225,10 @@ extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
 #define SAVAGE_APERTURE_OFFSET  0x02000000      /*  32MB */
 #define SAVAGE_APERTURE_SIZE    0x05000000      /* 5 tiled surfaces, 16MB each */
 
-#define SAVAGE_BCI_OFFSET       0x00010000      /* offset of the BCI region
+#define SAVAGE_BCI_OFFSET       0x00010000      /* offset of the BCI region
                                                  * inside the MMIO region */
-#define SAVAGE_BCI_FIFO_SIZE    32              /* number of entries in on-chip
-                                                 * BCI FIFO */
+#define SAVAGE_BCI_FIFO_SIZE    32      /* number of entries in on-chip
+                                         * BCI FIFO */
 
 /*
  * MMIO registers
@@ -278,7 +281,7 @@ extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
 #define SAVAGE_TEXADDR1_S4              0x23
 #define SAVAGE_TEXBLEND0_S4             0x24
 #define SAVAGE_TEXBLEND1_S4             0x25
-#define SAVAGE_TEXXPRCLR_S4             0x26 /* never used */
+#define SAVAGE_TEXXPRCLR_S4             0x26    /* never used */
 #define SAVAGE_TEXDESCR_S4              0x27
 #define SAVAGE_FOGTABLE_S4              0x28
 #define SAVAGE_FOGCTRL_S4               0x30
@@ -293,7 +296,7 @@ extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
 #define SAVAGE_TEXBLENDCOLOR_S4         0x39
 /* Savage3D/MX/IX 3D registers */
 #define SAVAGE_TEXPALADDR_S3D           0x18
-#define SAVAGE_TEXXPRCLR_S3D            0x19 /* never used */
+#define SAVAGE_TEXXPRCLR_S3D            0x19    /* never used */
 #define SAVAGE_TEXADDR_S3D              0x1A
 #define SAVAGE_TEXDESCR_S3D             0x1B
 #define SAVAGE_TEXCTRL_S3D              0x1C
@@ -305,7 +308,7 @@ extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
 #define SAVAGE_DESTCTRL_S3D             0x34
 #define SAVAGE_SCSTART_S3D              0x35
 #define SAVAGE_SCEND_S3D                0x36
-#define SAVAGE_ZWATERMARK_S3D           0x37 
+#define SAVAGE_ZWATERMARK_S3D           0x37
 #define SAVAGE_DESTTEXRWWATERMARK_S3D   0x38
 /* common stuff */
 #define SAVAGE_VERTBUFADDR              0x3e
@@ -313,9 +316,9 @@ extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
 #define SAVAGE_DMABUFADDR               0x51
 
 /* texture enable bits (needed for tex addr checking) */
-#define SAVAGE_TEXCTRL_TEXEN_MASK       0x00010000 /* S3D */
-#define SAVAGE_TEXDESCR_TEX0EN_MASK     0x02000000 /* S4 */
-#define SAVAGE_TEXDESCR_TEX1EN_MASK     0x04000000 /* S4 */
+#define SAVAGE_TEXCTRL_TEXEN_MASK       0x00010000      /* S3D */
+#define SAVAGE_TEXDESCR_TEX0EN_MASK     0x02000000      /* S4 */
+#define SAVAGE_TEXDESCR_TEX1EN_MASK     0x04000000      /* S4 */
 
 /* Global fields in Savage4/Twister/ProSavage 3D registers:
  *
@@ -576,4 +579,4 @@ extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
 #define TEST_AGE( age, e, w )                           \
         ( (age)->wrap < (w) || ( (age)->wrap == (w) && (age)->event <= (e) ) )
 
-#endif /* __SAVAGE_DRV_H__ */
+#endif                          /* __SAVAGE_DRV_H__ */