- Update to 2.6.25-rc3.
[linux-flexiantxendom0-3.2.10.git] / drivers / char / drm / mga_drv.h
index cd94c04..f6ebd24 100644 (file)
@@ -216,8 +216,8 @@ static inline u32 _MGA_READ(u32 * addr)
 #define MGA_WRITE( reg, val )  DRM_WRITE32(dev_priv->mmio, (reg), (val))
 #endif
 
-#define DWGREG0        0x1c00
-#define DWGREG0_END    0x1dff
+#define DWGREG0                0x1c00
+#define DWGREG0_END    0x1dff
 #define DWGREG1                0x2c00
 #define DWGREG1_END    0x2dff
 
@@ -249,7 +249,7 @@ do {                                                                        \
                } else if ( dev_priv->prim.space <                      \
                            dev_priv->prim.high_mark ) {                \
                        if ( MGA_DMA_DEBUG )                            \
-                               DRM_INFO( "%s: wrap...\n", __FUNCTION__ );      \
+                               DRM_INFO( "wrap...\n");         \
                        return -EBUSY;                  \
                }                                                       \
        }                                                               \
@@ -260,7 +260,7 @@ do {                                                                        \
        if ( test_bit( 0, &dev_priv->prim.wrapped ) ) {                 \
                if ( mga_do_wait_for_idle( dev_priv ) < 0 ) {           \
                        if ( MGA_DMA_DEBUG )                            \
-                               DRM_INFO( "%s: wrap...\n", __FUNCTION__ );      \
+                               DRM_INFO( "wrap...\n");         \
                        return -EBUSY;                  \
                }                                                       \
                mga_do_dma_wrap_end( dev_priv );                        \
@@ -280,8 +280,7 @@ do {                                                                        \
 #define BEGIN_DMA( n )                                                 \
 do {                                                                   \
        if ( MGA_VERBOSE ) {                                            \
-               DRM_INFO( "BEGIN_DMA( %d ) in %s\n",                    \
-                         (n), __FUNCTION__ );                          \
+               DRM_INFO( "BEGIN_DMA( %d )\n", (n) );           \
                DRM_INFO( "   space=0x%x req=0x%Zx\n",                  \
                          dev_priv->prim.space, (n) * DMA_BLOCK_SIZE ); \
        }                                                               \
@@ -292,7 +291,7 @@ do {                                                                        \
 #define BEGIN_DMA_WRAP()                                               \
 do {                                                                   \
        if ( MGA_VERBOSE ) {                                            \
-               DRM_INFO( "BEGIN_DMA() in %s\n", __FUNCTION__ );                \
+               DRM_INFO( "BEGIN_DMA()\n" );                            \
                DRM_INFO( "   space=0x%x\n", dev_priv->prim.space );    \
        }                                                               \
        prim = dev_priv->prim.start;                                    \
@@ -311,7 +310,7 @@ do {                                                                        \
 #define FLUSH_DMA()                                                    \
 do {                                                                   \
        if ( 0 ) {                                                      \
-               DRM_INFO( "%s:\n", __FUNCTION__ );                              \
+               DRM_INFO( "\n" );                                       \
                DRM_INFO( "   tail=0x%06x head=0x%06lx\n",              \
                          dev_priv->prim.tail,                          \
                          MGA_READ( MGA_PRIMADDRESS ) -                 \
@@ -394,22 +393,22 @@ do {                                                                      \
 #define MGA_VINTCLR                    (1 << 4)
 #define MGA_VINTEN                     (1 << 5)
 
-#define MGA_ALPHACTRL                  0x2c7c
-#define MGA_AR0                        0x1c60
-#define MGA_AR1                        0x1c64
-#define MGA_AR2                        0x1c68
-#define MGA_AR3                        0x1c6c
-#define MGA_AR4                        0x1c70
-#define MGA_AR5                        0x1c74
-#define MGA_AR6                        0x1c78
+#define MGA_ALPHACTRL                  0x2c7c
+#define MGA_AR0                                0x1c60
+#define MGA_AR1                                0x1c64
+#define MGA_AR2                                0x1c68
+#define MGA_AR3                                0x1c6c
+#define MGA_AR4                                0x1c70
+#define MGA_AR5                                0x1c74
+#define MGA_AR6                                0x1c78
 
 #define MGA_CXBNDRY                    0x1c80
-#define MGA_CXLEFT                     0x1ca0
+#define MGA_CXLEFT                     0x1ca0
 #define MGA_CXRIGHT                    0x1ca4
 
-#define MGA_DMAPAD                     0x1c54
-#define MGA_DSTORG                     0x2cb8
-#define MGA_DWGCTL                     0x1c00
+#define MGA_DMAPAD                     0x1c54
+#define MGA_DSTORG                     0x2cb8
+#define MGA_DWGCTL                     0x1c00
 #      define MGA_OPCOD_MASK                   (15 << 0)
 #      define MGA_OPCOD_TRAP                   (4 << 0)
 #      define MGA_OPCOD_TEXTURE_TRAP           (6 << 0)
@@ -455,27 +454,27 @@ do {                                                                      \
 #      define MGA_CLIPDIS                      (1 << 31)
 #define MGA_DWGSYNC                    0x2c4c
 
-#define MGA_FCOL                       0x1c24
-#define MGA_FIFOSTATUS                         0x1e10
-#define MGA_FOGCOL                     0x1cf4
+#define MGA_FCOL                       0x1c24
+#define MGA_FIFOSTATUS                 0x1e10
+#define MGA_FOGCOL                     0x1cf4
 #define MGA_FXBNDRY                    0x1c84
-#define MGA_FXLEFT                     0x1ca8
+#define MGA_FXLEFT                     0x1ca8
 #define MGA_FXRIGHT                    0x1cac
 
-#define MGA_ICLEAR                     0x1e18
+#define MGA_ICLEAR                     0x1e18
 #      define MGA_SOFTRAPICLR                  (1 << 0)
 #      define MGA_VLINEICLR                    (1 << 5)
-#define MGA_IEN                        0x1e1c
+#define MGA_IEN                                0x1e1c
 #      define MGA_SOFTRAPIEN                   (1 << 0)
 #      define MGA_VLINEIEN                     (1 << 5)
 
-#define MGA_LEN                        0x1c5c
+#define MGA_LEN                                0x1c5c
 
 #define MGA_MACCESS                    0x1c04
 
-#define MGA_PITCH                      0x1c8c
-#define MGA_PLNWT                      0x1c1c
-#define MGA_PRIMADDRESS                0x1e58
+#define MGA_PITCH                      0x1c8c
+#define MGA_PLNWT                      0x1c1c
+#define MGA_PRIMADDRESS                        0x1e58
 #      define MGA_DMA_GENERAL                  (0 << 0)
 #      define MGA_DMA_BLIT                     (1 << 0)
 #      define MGA_DMA_VECTOR                   (2 << 0)
@@ -487,43 +486,43 @@ do {                                                                      \
 #      define MGA_PRIMPTREN0                   (1 << 0)
 #      define MGA_PRIMPTREN1                   (1 << 1)
 
-#define MGA_RST                        0x1e40
+#define MGA_RST                                0x1e40
 #      define MGA_SOFTRESET                    (1 << 0)
 #      define MGA_SOFTEXTRST                   (1 << 1)
 
-#define MGA_SECADDRESS                         0x2c40
-#define MGA_SECEND                     0x2c44
-#define MGA_SETUPADDRESS               0x2cd0
-#define MGA_SETUPEND                   0x2cd4
+#define MGA_SECADDRESS                 0x2c40
+#define MGA_SECEND                     0x2c44
+#define MGA_SETUPADDRESS               0x2cd0
+#define MGA_SETUPEND                   0x2cd4
 #define MGA_SGN                                0x1c58
 #define MGA_SOFTRAP                    0x2c48
-#define MGA_SRCORG                     0x2cb4
+#define MGA_SRCORG                     0x2cb4
 #      define MGA_SRMMAP_MASK                  (1 << 0)
 #      define MGA_SRCMAP_FB                    (0 << 0)
 #      define MGA_SRCMAP_SYSMEM                (1 << 0)
 #      define MGA_SRCACC_MASK                  (1 << 1)
 #      define MGA_SRCACC_PCI                   (0 << 1)
 #      define MGA_SRCACC_AGP                   (1 << 1)
-#define MGA_STATUS                     0x1e14
+#define MGA_STATUS                     0x1e14
 #      define MGA_SOFTRAPEN                    (1 << 0)
 #      define MGA_VSYNCPEN                     (1 << 4)
 #      define MGA_VLINEPEN                     (1 << 5)
 #      define MGA_DWGENGSTS                    (1 << 16)
 #      define MGA_ENDPRDMASTS                  (1 << 17)
 #define MGA_STENCIL                    0x2cc8
-#define MGA_STENCILCTL                         0x2ccc
+#define MGA_STENCILCTL                 0x2ccc
 
-#define MGA_TDUALSTAGE0                0x2cf8
-#define MGA_TDUALSTAGE1                0x2cfc
-#define MGA_TEXBORDERCOL               0x2c5c
-#define MGA_TEXCTL                     0x2c30
+#define MGA_TDUALSTAGE0                        0x2cf8
+#define MGA_TDUALSTAGE1                        0x2cfc
+#define MGA_TEXBORDERCOL               0x2c5c
+#define MGA_TEXCTL                     0x2c30
 #define MGA_TEXCTL2                    0x2c3c
 #      define MGA_DUALTEX                      (1 << 7)
 #      define MGA_G400_TC2_MAGIC               (1 << 15)
 #      define MGA_MAP1_ENABLE                  (1 << 31)
-#define MGA_TEXFILTER                  0x2c58
-#define MGA_TEXHEIGHT                  0x2c2c
-#define MGA_TEXORG                     0x2c24
+#define MGA_TEXFILTER                  0x2c58
+#define MGA_TEXHEIGHT                  0x2c2c
+#define MGA_TEXORG                     0x2c24
 #      define MGA_TEXORGMAP_MASK               (1 << 0)
 #      define MGA_TEXORGMAP_FB                 (0 << 0)
 #      define MGA_TEXORGMAP_SYSMEM             (1 << 0)
@@ -534,45 +533,45 @@ do {                                                                      \
 #define MGA_TEXORG2                    0x2ca8
 #define MGA_TEXORG3                    0x2cac
 #define MGA_TEXORG4                    0x2cb0
-#define MGA_TEXTRANS                   0x2c34
-#define MGA_TEXTRANSHIGH               0x2c38
-#define MGA_TEXWIDTH                   0x2c28
-
-#define MGA_WACCEPTSEQ                         0x1dd4
-#define MGA_WCODEADDR                  0x1e6c
-#define MGA_WFLAG                      0x1dc4
-#define MGA_WFLAG1                     0x1de0
+#define MGA_TEXTRANS                   0x2c34
+#define MGA_TEXTRANSHIGH               0x2c38
+#define MGA_TEXWIDTH                   0x2c28
+
+#define MGA_WACCEPTSEQ                 0x1dd4
+#define MGA_WCODEADDR                  0x1e6c
+#define MGA_WFLAG                      0x1dc4
+#define MGA_WFLAG1                     0x1de0
 #define MGA_WFLAGNB                    0x1e64
-#define MGA_WFLAGNB1                   0x1e08
+#define MGA_WFLAGNB1                   0x1e08
 #define MGA_WGETMSB                    0x1dc8
-#define MGA_WIADDR                     0x1dc0
+#define MGA_WIADDR                     0x1dc0
 #define MGA_WIADDR2                    0x1dd8
 #      define MGA_WMODE_SUSPEND                (0 << 0)
 #      define MGA_WMODE_RESUME                 (1 << 0)
 #      define MGA_WMODE_JUMP                   (2 << 0)
 #      define MGA_WMODE_START                  (3 << 0)
 #      define MGA_WAGP_ENABLE                  (1 << 2)
-#define MGA_WMISC                      0x1e70
+#define MGA_WMISC                      0x1e70
 #      define MGA_WUCODECACHE_ENABLE           (1 << 0)
 #      define MGA_WMASTER_ENABLE               (1 << 1)
 #      define MGA_WCACHEFLUSH_ENABLE           (1 << 3)
 #define MGA_WVRTXSZ                    0x1dcc
 
-#define MGA_YBOT                       0x1c9c
-#define MGA_YDST                       0x1c90
+#define MGA_YBOT                       0x1c9c
+#define MGA_YDST                       0x1c90
 #define MGA_YDSTLEN                    0x1c88
 #define MGA_YDSTORG                    0x1c94
-#define MGA_YTOP                       0x1c98
+#define MGA_YTOP                       0x1c98
 
-#define MGA_ZORG                       0x1c0c
+#define MGA_ZORG                       0x1c0c
 
 /* This finishes the current batch of commands
  */
-#define MGA_EXEC                       0x0100
+#define MGA_EXEC                       0x0100
 
 /* AGP PLL encoding (for G200 only).
  */
-#define MGA_AGP_PLL                    0x1e4c
+#define MGA_AGP_PLL                    0x1e4c
 #      define MGA_AGP2XPLL_DISABLE             (0 << 0)
 #      define MGA_AGP2XPLL_ENABLE              (1 << 0)