Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

Manual fixups for some clashes due to re-indenting.

1 files changed, 57 insertions, 63 deletions

diff --git a/drivers/char/drm/mga_warp.c b/drivers/char/drm/mga_warp.c
index 55ccc8a0ac29..d67f4925fbac 100644
--- a/drivers/char/drm/mga_warp.c
+++ b/drivers/char/drm/mga_warp.c
@@ -33,8 +33,7 @@
 #include "mga_drv.h"
 #include "mga_ucode.h"
 
-
-#define MGA_WARP_CODE_ALIGN             256             /* in bytes */
+#define MGA_WARP_CODE_ALIGN             256     /* in bytes */
 
 #define WARP_UCODE_SIZE( which )                                        \
         ((sizeof(which) / MGA_WARP_CODE_ALIGN + 1) * MGA_WARP_CODE_ALIGN)
@@ -49,33 +48,30 @@ do {									\
 } while (0)
 
 static const unsigned int mga_warp_g400_microcode_size =
-               (WARP_UCODE_SIZE(warp_g400_tgz) +
-                WARP_UCODE_SIZE(warp_g400_tgza) +
-                WARP_UCODE_SIZE(warp_g400_tgzaf) +
-                WARP_UCODE_SIZE(warp_g400_tgzf) +
-                WARP_UCODE_SIZE(warp_g400_tgzs) +
-                WARP_UCODE_SIZE(warp_g400_tgzsa) +
-                WARP_UCODE_SIZE(warp_g400_tgzsaf) +
-                WARP_UCODE_SIZE(warp_g400_tgzsf) +
-                WARP_UCODE_SIZE(warp_g400_t2gz) +
-                WARP_UCODE_SIZE(warp_g400_t2gza) +
-                WARP_UCODE_SIZE(warp_g400_t2gzaf) +
-                WARP_UCODE_SIZE(warp_g400_t2gzf) +
-                WARP_UCODE_SIZE(warp_g400_t2gzs) +
-                WARP_UCODE_SIZE(warp_g400_t2gzsa) +
-                WARP_UCODE_SIZE(warp_g400_t2gzsaf) +
-                WARP_UCODE_SIZE(warp_g400_t2gzsf));
+    (WARP_UCODE_SIZE(warp_g400_tgz) +
+     WARP_UCODE_SIZE(warp_g400_tgza) +
+     WARP_UCODE_SIZE(warp_g400_tgzaf) +
+     WARP_UCODE_SIZE(warp_g400_tgzf) +
+     WARP_UCODE_SIZE(warp_g400_tgzs) +
+     WARP_UCODE_SIZE(warp_g400_tgzsa) +
+     WARP_UCODE_SIZE(warp_g400_tgzsaf) +
+     WARP_UCODE_SIZE(warp_g400_tgzsf) +
+     WARP_UCODE_SIZE(warp_g400_t2gz) +
+     WARP_UCODE_SIZE(warp_g400_t2gza) +
+     WARP_UCODE_SIZE(warp_g400_t2gzaf) +
+     WARP_UCODE_SIZE(warp_g400_t2gzf) +
+     WARP_UCODE_SIZE(warp_g400_t2gzs) +
+     WARP_UCODE_SIZE(warp_g400_t2gzsa) +
+     WARP_UCODE_SIZE(warp_g400_t2gzsaf) + WARP_UCODE_SIZE(warp_g400_t2gzsf));
 
 static const unsigned int mga_warp_g200_microcode_size =
-               (WARP_UCODE_SIZE(warp_g200_tgz) +
-                WARP_UCODE_SIZE(warp_g200_tgza) +
-                WARP_UCODE_SIZE(warp_g200_tgzaf) +
-                WARP_UCODE_SIZE(warp_g200_tgzf) +
-                WARP_UCODE_SIZE(warp_g200_tgzs) +
-                WARP_UCODE_SIZE(warp_g200_tgzsa) +
-                WARP_UCODE_SIZE(warp_g200_tgzsaf) +
-                WARP_UCODE_SIZE(warp_g200_tgzsf));
-
+    (WARP_UCODE_SIZE(warp_g200_tgz) +
+     WARP_UCODE_SIZE(warp_g200_tgza) +
+     WARP_UCODE_SIZE(warp_g200_tgzaf) +
+     WARP_UCODE_SIZE(warp_g200_tgzf) +
+     WARP_UCODE_SIZE(warp_g200_tgzs) +
+     WARP_UCODE_SIZE(warp_g200_tgzsa) +
+     WARP_UCODE_SIZE(warp_g200_tgzsaf) + WARP_UCODE_SIZE(warp_g200_tgzsf));
 
 unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv)
 {
@@ -90,36 +86,35 @@ unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv)
         }
 }
 
-static int mga_warp_install_g400_microcode( drm_mga_private_t *dev_priv )
+static int mga_warp_install_g400_microcode(drm_mga_private_t * dev_priv)
 {
         unsigned char *vcbase = dev_priv->warp->handle;
         unsigned long pcbase = dev_priv->warp->offset;
 
-        memset( dev_priv->warp_pipe_phys, 0,
-                sizeof(dev_priv->warp_pipe_phys) );
-
-        WARP_UCODE_INSTALL( warp_g400_tgz,      MGA_WARP_TGZ );
-        WARP_UCODE_INSTALL( warp_g400_tgzf,     MGA_WARP_TGZF );
-        WARP_UCODE_INSTALL( warp_g400_tgza,     MGA_WARP_TGZA );
-        WARP_UCODE_INSTALL( warp_g400_tgzaf,    MGA_WARP_TGZAF );
-        WARP_UCODE_INSTALL( warp_g400_tgzs,     MGA_WARP_TGZS );
-        WARP_UCODE_INSTALL( warp_g400_tgzsf,    MGA_WARP_TGZSF );
-        WARP_UCODE_INSTALL( warp_g400_tgzsa,    MGA_WARP_TGZSA );
-        WARP_UCODE_INSTALL( warp_g400_tgzsaf,   MGA_WARP_TGZSAF );
-
-        WARP_UCODE_INSTALL( warp_g400_t2gz,     MGA_WARP_T2GZ );
-        WARP_UCODE_INSTALL( warp_g400_t2gzf,    MGA_WARP_T2GZF );
-        WARP_UCODE_INSTALL( warp_g400_t2gza,    MGA_WARP_T2GZA );
-        WARP_UCODE_INSTALL( warp_g400_t2gzaf,   MGA_WARP_T2GZAF );
-        WARP_UCODE_INSTALL( warp_g400_t2gzs,    MGA_WARP_T2GZS );
-        WARP_UCODE_INSTALL( warp_g400_t2gzsf,   MGA_WARP_T2GZSF );
-        WARP_UCODE_INSTALL( warp_g400_t2gzsa,   MGA_WARP_T2GZSA );
-        WARP_UCODE_INSTALL( warp_g400_t2gzsaf,  MGA_WARP_T2GZSAF );
+        memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
+
+        WARP_UCODE_INSTALL(warp_g400_tgz, MGA_WARP_TGZ);
+        WARP_UCODE_INSTALL(warp_g400_tgzf, MGA_WARP_TGZF);
+        WARP_UCODE_INSTALL(warp_g400_tgza, MGA_WARP_TGZA);
+        WARP_UCODE_INSTALL(warp_g400_tgzaf, MGA_WARP_TGZAF);
+        WARP_UCODE_INSTALL(warp_g400_tgzs, MGA_WARP_TGZS);
+        WARP_UCODE_INSTALL(warp_g400_tgzsf, MGA_WARP_TGZSF);
+        WARP_UCODE_INSTALL(warp_g400_tgzsa, MGA_WARP_TGZSA);
+        WARP_UCODE_INSTALL(warp_g400_tgzsaf, MGA_WARP_TGZSAF);
+
+        WARP_UCODE_INSTALL(warp_g400_t2gz, MGA_WARP_T2GZ);
+        WARP_UCODE_INSTALL(warp_g400_t2gzf, MGA_WARP_T2GZF);
+        WARP_UCODE_INSTALL(warp_g400_t2gza, MGA_WARP_T2GZA);
+        WARP_UCODE_INSTALL(warp_g400_t2gzaf, MGA_WARP_T2GZAF);
+        WARP_UCODE_INSTALL(warp_g400_t2gzs, MGA_WARP_T2GZS);
+        WARP_UCODE_INSTALL(warp_g400_t2gzsf, MGA_WARP_T2GZSF);
+        WARP_UCODE_INSTALL(warp_g400_t2gzsa, MGA_WARP_T2GZSA);
+        WARP_UCODE_INSTALL(warp_g400_t2gzsaf, MGA_WARP_T2GZSAF);
 
         return 0;
 }
 
-static int mga_warp_install_g200_microcode( drm_mga_private_t *dev_priv )
+static int mga_warp_install_g200_microcode(drm_mga_private_t * dev_priv)
 {
         unsigned char *vcbase = dev_priv->warp->handle;
         unsigned long pcbase = dev_priv->warp->offset;
@@ -138,7 +133,7 @@ static int mga_warp_install_g200_microcode( drm_mga_private_t *dev_priv )
         return 0;
 }
 
-int mga_warp_install_microcode( drm_mga_private_t *dev_priv )
+int mga_warp_install_microcode(drm_mga_private_t * dev_priv)
 {
         const unsigned int size = mga_warp_microcode_size(dev_priv);
 
@@ -154,7 +149,7 @@ int mga_warp_install_microcode(	drm_mga_private_t *dev_priv )
         case MGA_CARD_TYPE_G550:
                 return mga_warp_install_g400_microcode(dev_priv);
         case MGA_CARD_TYPE_G200:
-                return mga_warp_install_g200_microcode( dev_priv );
+                return mga_warp_install_g200_microcode(dev_priv);
         default:
                 return DRM_ERR(EINVAL);
         }
@@ -162,13 +157,13 @@ int mga_warp_install_microcode(	drm_mga_private_t *dev_priv )
 
 #define WMISC_EXPECTED          (MGA_WUCODECACHE_ENABLE | MGA_WMASTER_ENABLE)
 
-int mga_warp_init( drm_mga_private_t *dev_priv )
+int mga_warp_init(drm_mga_private_t * dev_priv)
 {
         u32 wmisc;
 
         /* FIXME: Get rid of these damned magic numbers...
          */
-        switch ( dev_priv->chipset ) {
+        switch (dev_priv->chipset) {
         case MGA_CARD_TYPE_G400:
         case MGA_CARD_TYPE_G550:
                 MGA_WRITE(MGA_WIADDR2, MGA_WMODE_SUSPEND);
@@ -177,21 +172,20 @@ int mga_warp_init( drm_mga_private_t *dev_priv )
                 MGA_WRITE(MGA_WACCEPTSEQ, 0x18000000);
                 break;
         case MGA_CARD_TYPE_G200:
-                MGA_WRITE( MGA_WIADDR, MGA_WMODE_SUSPEND );
-                MGA_WRITE( MGA_WGETMSB, 0x1606 );
-                MGA_WRITE( MGA_WVRTXSZ, 7 );
+                MGA_WRITE(MGA_WIADDR, MGA_WMODE_SUSPEND);
+                MGA_WRITE(MGA_WGETMSB, 0x1606);
+                MGA_WRITE(MGA_WVRTXSZ, 7);
                 break;
         default:
                 return DRM_ERR(EINVAL);
         }
 
-        MGA_WRITE( MGA_WMISC, (MGA_WUCODECACHE_ENABLE |
-                               MGA_WMASTER_ENABLE |
-                               MGA_WCACHEFLUSH_ENABLE) );
-        wmisc = MGA_READ( MGA_WMISC );
-        if ( wmisc != WMISC_EXPECTED ) {
-                DRM_ERROR( "WARP engine config failed! 0x%x != 0x%x\n",
-                           wmisc, WMISC_EXPECTED );
+        MGA_WRITE(MGA_WMISC, (MGA_WUCODECACHE_ENABLE |
+                              MGA_WMASTER_ENABLE | MGA_WCACHEFLUSH_ENABLE));
+        wmisc = MGA_READ(MGA_WMISC);
+        if (wmisc != WMISC_EXPECTED) {
+                DRM_ERROR("WARP engine config failed! 0x%x != 0x%x\n",
+                          wmisc, WMISC_EXPECTED);
                 return DRM_ERR(EINVAL);
         }