Merged mga branch with trunk
[platform/upstream/libdrm.git] / linux / mga_state.c
index d09881b..a70f86d 100644 (file)
  * Authors: Jeff Hartmann <jhartmann@precisioninsight.com>
  *         Keith Whitwell <keithw@precisioninsight.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c,v 1.1 2000/02/11 17:26:08 dawes Exp $
+ * $XFree86$
  *
  */
  
 #define __NO_VERSION__
 #include "drmP.h"
 #include "mga_drv.h"
-#include "mgareg_flags.h"
-#include "mga_dma.h"
-#include "mga_state.h"
 #include "drm.h"
 
-void mgaEmitClipRect( drm_mga_private_t *dev_priv, xf86drmClipRectRec *box )
+static void mgaEmitClipRect( drm_mga_private_t *dev_priv, 
+                            drm_clip_rect_t *box )
 {
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       unsigned int *regs = sarea_priv->ContextState;
        PRIMLOCALS;
 
+       /* This takes 10 dwords */
        PRIMGETPTR( dev_priv );
+   
+       /* Force reset of dwgctl (eliminates clip disable) */
+       PRIMOUTREG( MGAREG_DMAPAD, 0 );
+       PRIMOUTREG( MGAREG_DWGSYNC, dev_priv->last_sync_tag - 1 );
+       PRIMOUTREG( MGAREG_DWGSYNC, dev_priv->last_sync_tag - 1 );
+       PRIMOUTREG( MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL] );
 
-       /* The G400 seems to have an issue with the second WARP not
-        * stalling clipper register writes.  This bothers me, but the only
-        * way I could get it to never clip the last triangle under any
-        * circumstances is by inserting TWO dwgsync commands.
-        */
-       if (dev_priv->chipset == MGA_CARD_TYPE_G400) { 
-               PRIMOUTREG( MGAREG_DWGSYNC, 0 );
-               PRIMOUTREG( MGAREG_DWGSYNC, 0 );
-       }
-
+       PRIMOUTREG( MGAREG_DMAPAD, 0 );
        PRIMOUTREG( MGAREG_CXBNDRY, ((box->x2)<<16)|(box->x1) );
-       PRIMOUTREG( MGAREG_YTOP, box->y1 * dev_priv->stride );
-       PRIMOUTREG( MGAREG_YBOT, box->y2 * dev_priv->stride );
+       PRIMOUTREG( MGAREG_YTOP, box->y1 * dev_priv->stride/2 );
+       PRIMOUTREG( MGAREG_YBOT, box->y2 * dev_priv->stride/2 );
+
        PRIMADVANCE( dev_priv );
 }
 
-
-static void mgaEmitContext(drm_mga_private_t *dev_priv, 
-                          drm_mga_buf_priv_t *buf_priv)
+static void mgaEmitContext(drm_mga_private_t *dev_priv )
 {
-       unsigned int *regs = buf_priv->ContextState;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       unsigned int *regs = sarea_priv->ContextState;
        PRIMLOCALS;
        
+       /* This takes a max of 15 dwords */
        PRIMGETPTR( dev_priv );
+
        PRIMOUTREG( MGAREG_DSTORG, regs[MGA_CTXREG_DSTORG] );
        PRIMOUTREG( MGAREG_MACCESS, regs[MGA_CTXREG_MACCESS] );
        PRIMOUTREG( MGAREG_PLNWT, regs[MGA_CTXREG_PLNWT] );
        PRIMOUTREG( MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL] );
+
        PRIMOUTREG( MGAREG_ALPHACTRL, regs[MGA_CTXREG_ALPHACTRL] );
        PRIMOUTREG( MGAREG_FOGCOL, regs[MGA_CTXREG_FOGCOLOR] );
        PRIMOUTREG( MGAREG_WFLAG, regs[MGA_CTXREG_WFLAG] );
+       PRIMOUTREG( MGAREG_ZORG, dev_priv->depthOffset ); /* invarient */
 
        if (dev_priv->chipset == MGA_CARD_TYPE_G400) { 
                PRIMOUTREG( MGAREG_WFLAG1, regs[MGA_CTXREG_WFLAG] );
                PRIMOUTREG( MGAREG_TDUALSTAGE0, regs[MGA_CTXREG_TDUAL0] );
                PRIMOUTREG( MGAREG_TDUALSTAGE1, regs[MGA_CTXREG_TDUAL1] );      
-       }   
+               PRIMOUTREG( MGAREG_FCOL, regs[MGA_CTXREG_FCOL] );
+       } else {
+               PRIMOUTREG( MGAREG_FCOL, regs[MGA_CTXREG_FCOL] );
+               PRIMOUTREG( MGAREG_DMAPAD, 0);
+               PRIMOUTREG( MGAREG_DMAPAD, 0);
+               PRIMOUTREG( MGAREG_DMAPAD, 0);
+       }
    
        PRIMADVANCE( dev_priv );
 }
 
-static void mgaG200EmitTex( drm_mga_private_t *dev_priv, 
-                           drm_mga_buf_priv_t *buf_priv )
+static void mgaG200EmitTex( drm_mga_private_t *dev_priv )
 {
-       unsigned int *regs = buf_priv->TexState[0];
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       unsigned int *regs = sarea_priv->TexState[0];
        PRIMLOCALS;
 
        PRIMGETPTR( dev_priv );
+   
+       /* This takes 20 dwords */
+
        PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] );
        PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL] );
        PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER] );
        PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL] );
+
        PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG] );
        PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1] );
        PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2] );
        PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3] );
+
        PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4] );             
        PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH] );
-       PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );
-   
+       PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );   
        PRIMOUTREG(0x2d00 + 24*4, regs[MGA_TEXREG_WIDTH] );
+
        PRIMOUTREG(0x2d00 + 34*4, regs[MGA_TEXREG_HEIGHT] );
+       PRIMOUTREG( MGAREG_TEXTRANS, 0xffff );
+       PRIMOUTREG( MGAREG_TEXTRANSHIGH, 0xffff );
+       PRIMOUTREG( MGAREG_DMAPAD, 0 );
 
        PRIMADVANCE( dev_priv );  
 }
 
-static void mgaG400EmitTex0( drm_mga_private_t *dev_priv, 
-                            drm_mga_buf_priv_t *buf_priv )
+static void mgaG400EmitTex0( drm_mga_private_t *dev_priv )
 {
-       unsigned int *regs = buf_priv->TexState[0];
-       int multitex = buf_priv->WarpPipe & MGA_T2;
-
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       unsigned int *regs = sarea_priv->TexState[0];
+       int multitex = sarea_priv->WarpPipe & MGA_T2;
        PRIMLOCALS;
+   
        PRIMGETPTR( dev_priv );
+   
+       /* This takes a max of 30 dwords */
 
        PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] );
        PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL] );
        PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER] );
        PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL] );
+
        PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG] );
        PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1] );
        PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2] );
        PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3] );
+
        PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4] );             
        PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH] );
-       PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );
-   
+       PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );   
        PRIMOUTREG(0x2d00 + 49*4, 0);
+
        PRIMOUTREG(0x2d00 + 57*4, 0);
        PRIMOUTREG(0x2d00 + 53*4, 0);
        PRIMOUTREG(0x2d00 + 61*4, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0 );
 
        if (!multitex) {
                PRIMOUTREG(0x2d00 + 52*4, 0x40 ); 
                PRIMOUTREG(0x2d00 + 60*4, 0x40 );
+               PRIMOUTREG( MGAREG_DMAPAD, 0 );
+               PRIMOUTREG( MGAREG_DMAPAD, 0 );
        } 
 
-       PRIMOUTREG(0x2d00 + 54*4, regs[MGA_TEXREG_WIDTH] | 0x40 );
-       PRIMOUTREG(0x2d00 + 62*4, regs[MGA_TEXREG_HEIGHT] | 0x40 );
+       PRIMOUTREG( 0x2d00 + 54*4, regs[MGA_TEXREG_WIDTH] | 0x40 );
+       PRIMOUTREG( 0x2d00 + 62*4, regs[MGA_TEXREG_HEIGHT] | 0x40 );
+       PRIMOUTREG( MGAREG_TEXTRANS, 0xffff );
+       PRIMOUTREG( MGAREG_TEXTRANSHIGH, 0xffff );
 
        PRIMADVANCE( dev_priv );  
 }
 
 #define TMC_map1_enable                0x80000000      
 
-
-static void mgaG400EmitTex1( drm_mga_private_t *dev_priv, 
-                            drm_mga_buf_priv_t *buf_priv )
+static void mgaG400EmitTex1( drm_mga_private_t *dev_priv )
 {
-       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int *regs = sarea_priv->TexState[1];
-
        PRIMLOCALS;
+   
        PRIMGETPTR(dev_priv);
 
+       /* This takes 25 dwords */
        PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] | TMC_map1_enable);
        PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL] );
        PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER] );
        PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL] );
+
        PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG] );
        PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1] );
        PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2] );
        PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3] );
+
        PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4] );             
        PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH] );
-       PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );
-   
+       PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );   
        PRIMOUTREG(0x2d00 + 49*4, 0);
+
        PRIMOUTREG(0x2d00 + 57*4, 0);
        PRIMOUTREG(0x2d00 + 53*4, 0);
        PRIMOUTREG(0x2d00 + 61*4, 0);
-
        PRIMOUTREG(0x2d00 + 52*4, regs[MGA_TEXREG_WIDTH] | 0x40 ); 
-       PRIMOUTREG(0x2d00 + 60*4, regs[MGA_TEXREG_HEIGHT] | 0x40 );
 
+       PRIMOUTREG(0x2d00 + 60*4, regs[MGA_TEXREG_HEIGHT] | 0x40 );
+       PRIMOUTREG( MGAREG_TEXTRANS, 0xffff );
+       PRIMOUTREG( MGAREG_TEXTRANSHIGH, 0xffff );
        PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] );
 
-       PRIMADVANCE( dev_priv );     
+       PRIMADVANCE( dev_priv );
 }
 
-
-static void mgaG400EmitPipe(drm_mga_private_t *dev_priv, 
-                           drm_mga_buf_priv_t *buf_priv)
+static void mgaG400EmitPipe(drm_mga_private_t *dev_priv )
 {
-       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int pipe = sarea_priv->WarpPipe;
        float fParam = 12800.0f;
        PRIMLOCALS;
    
        PRIMGETPTR(dev_priv);
-       PRIMOUTREG(MGAREG_WIADDR2, WIA_wmode_suspend);
+
+       /* This takes 25 dwords */
    
        /* Establish vertex size.  
         */
        if (pipe & MGA_T2) {
+               PRIMOUTREG(MGAREG_WIADDR2, WIA_wmode_suspend);
                PRIMOUTREG(MGAREG_WVRTXSZ, 0x00001e09);
                PRIMOUTREG(MGAREG_WACCEPTSEQ, 0x1e000000);
+               PRIMOUTREG(MGAREG_WFLAG, 0);
        } else {
+               PRIMOUTREG(MGAREG_WIADDR2, WIA_wmode_suspend);
                PRIMOUTREG(MGAREG_WVRTXSZ, 0x00001807);
                PRIMOUTREG(MGAREG_WACCEPTSEQ, 0x18000000);
-       }
-   
-       PRIMOUTREG(MGAREG_WFLAG, 0);
-       PRIMOUTREG(MGAREG_WFLAG1, 0);
-   
+               PRIMOUTREG(MGAREG_WFLAG, 0);
+       }   
+
+       PRIMOUTREG(MGAREG_WFLAG1, 0);   
        PRIMOUTREG(0x2d00 + 56*4, *((u32 *)(&fParam)));
        PRIMOUTREG(MGAREG_DMAPAD, 0);
        PRIMOUTREG(MGAREG_DMAPAD, 0);
@@ -227,19 +255,21 @@ static void mgaG400EmitPipe(drm_mga_private_t *dev_priv,
        PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
        PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
        PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
-       PRIMOUTREG(MGAREG_WIADDR2, (dev_priv->WarpIndex[pipe].phys_addr | 
-                                  WIA_wmode_start | WIA_wagp_agp));
+       PRIMOUTREG(MGAREG_WIADDR2, (__u32)(dev_priv->WarpIndex[pipe].phys_addr |
+                                          WIA_wmode_start | WIA_wagp_agp));
        PRIMADVANCE(dev_priv);
 }
 
-static void mgaG200EmitPipe( drm_mga_private_t *dev_priv,
-                            drm_mga_buf_priv_t *buf_priv )
+static void mgaG200EmitPipe( drm_mga_private_t *dev_priv )
 {
-       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int pipe = sarea_priv->WarpPipe;
        PRIMLOCALS;
 
        PRIMGETPTR(dev_priv);
+   
+       /* This takes 15 dwords */
+
        PRIMOUTREG(MGAREG_WIADDR, WIA_wmode_suspend);
        PRIMOUTREG(MGAREG_WVRTXSZ, 7);
        PRIMOUTREG(MGAREG_WFLAG, 0);
@@ -254,109 +284,629 @@ static void mgaG200EmitPipe( drm_mga_private_t *dev_priv,
        PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
        PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
        PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
-       PRIMOUTREG(MGAREG_WIADDR, (dev_priv->WarpIndex[pipe].phys_addr | 
-                                 WIA_wmode_start | WIA_wagp_agp));
+       PRIMOUTREG(MGAREG_WIADDR, (__u32)(dev_priv->WarpIndex[pipe].phys_addr | 
+                                         WIA_wmode_start | WIA_wagp_agp));
 
        PRIMADVANCE(dev_priv);
 }
 
-void mgaEmitState( drm_mga_private_t *dev_priv, drm_mga_buf_priv_t *buf_priv )
+static void mgaEmitState( drm_mga_private_t *dev_priv )
 {
-       unsigned int dirty = buf_priv->dirty;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       unsigned int dirty = sarea_priv->dirty;
 
        if (dev_priv->chipset == MGA_CARD_TYPE_G400) {     
-               if (dirty & MGASAREA_NEW_CONTEXT)
-                       mgaEmitContext( dev_priv, buf_priv );
-
-               if (dirty & MGASAREA_NEW_TEX1)
-                       mgaG400EmitTex1( dev_priv, buf_priv );
-          
-               if (dirty & MGASAREA_NEW_TEX0)
-                       mgaG400EmitTex0( dev_priv, buf_priv );
-
-               if (dirty & MGASAREA_NEW_PIPE) 
-                       mgaG400EmitPipe( dev_priv, buf_priv );
+               int multitex = sarea_priv->WarpPipe & MGA_T2;
+
+               if (sarea_priv->WarpPipe != dev_priv->WarpPipe) { 
+                       mgaG400EmitPipe( dev_priv );
+                       dev_priv->WarpPipe = sarea_priv->WarpPipe;
+               }
+
+               if (dirty & MGA_UPLOAD_CTX) {
+                       mgaEmitContext( dev_priv );
+                       sarea_priv->dirty &= ~MGA_UPLOAD_CTX;
+               }
+
+               if (dirty & MGA_UPLOAD_TEX0) {
+                       mgaG400EmitTex0( dev_priv );
+                       sarea_priv->dirty &= ~MGA_UPLOAD_TEX0;
+               }
+
+               if ((dirty & MGA_UPLOAD_TEX1) && multitex) {
+                       mgaG400EmitTex1( dev_priv );
+                       sarea_priv->dirty &= ~MGA_UPLOAD_TEX1;
+               }
        } else {
-               if (dirty & MGASAREA_NEW_CONTEXT)
-                       mgaEmitContext( dev_priv, buf_priv );
-
-               if (dirty & MGASAREA_NEW_TEX0)
-                       mgaG200EmitTex( dev_priv, buf_priv );
-
-               if (dirty & MGASAREA_NEW_PIPE) 
-                       mgaG200EmitPipe( dev_priv, buf_priv );
-       }         
+               if (sarea_priv->WarpPipe != dev_priv->WarpPipe) { 
+                       mgaG200EmitPipe( dev_priv );
+                       dev_priv->WarpPipe = sarea_priv->WarpPipe;
+               }
+
+               if (dirty & MGA_UPLOAD_CTX) {
+                       mgaEmitContext( dev_priv );
+                       sarea_priv->dirty &= ~MGA_UPLOAD_CTX;
+               }
+
+               if (dirty & MGA_UPLOAD_TEX0) {
+                       mgaG200EmitTex( dev_priv );
+                       sarea_priv->dirty &= ~MGA_UPLOAD_TEX0;
+               }
+       }
 }
 
 
-
 /* Disallow all write destinations except the front and backbuffer.
  */
-static int mgaCopyContext(drm_mga_private_t *dev_priv, 
-                         drm_mga_buf_priv_t *buf_priv)
+static int mgaVerifyContext(drm_mga_private_t *dev_priv )
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int *regs = sarea_priv->ContextState;
-       
-       if (regs[MGA_CTXREG_DSTORG] != dev_priv->frontOrg &&
-           regs[MGA_CTXREG_DSTORG] != dev_priv->backOrg)
+
+       if (regs[MGA_CTXREG_DSTORG] != dev_priv->frontOffset &&
+           regs[MGA_CTXREG_DSTORG] != dev_priv->backOffset) {
+               DRM_DEBUG("BAD DSTORG: %x (front %x, back %x)\n\n", 
+                      regs[MGA_CTXREG_DSTORG], dev_priv->frontOffset,
+                      dev_priv->backOffset);
+               regs[MGA_CTXREG_DSTORG] = 0;
                return -1;
+       }
 
-       memcpy(buf_priv->ContextState, sarea_priv->ContextState,
-              sizeof(buf_priv->ContextState));
        return 0;
 }
 
-
 /* Disallow texture reads from PCI space.
  */
-static int mgaCopyTex(drm_mga_private_t *dev_priv, 
-                     drm_mga_buf_priv_t *buf_priv,
+static int mgaVerifyTex(drm_mga_private_t *dev_priv, 
                      int unit)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
 
-       if ((sarea_priv->TexState[unit][MGA_TEXREG_ORG] & 0x3) == 0x1)
+       if ((sarea_priv->TexState[unit][MGA_TEXREG_ORG] & 0x3) == 0x1) {
+               DRM_DEBUG("BAD TEXREG_ORG: %x, unit %d\n", 
+                      sarea_priv->TexState[unit][MGA_TEXREG_ORG],
+                      unit);
+               sarea_priv->TexState[unit][MGA_TEXREG_ORG] = 0;
                return -1;
-
-       memcpy(buf_priv->TexState[unit], sarea_priv->TexState[unit],
-              sizeof(buf_priv->TexState[0]));
+       } 
 
        return 0;
 }
 
-
-int mgaCopyAndVerifyState( drm_mga_private_t *dev_priv, 
-                          drm_mga_buf_priv_t *buf_priv )
+static int mgaVerifyState( drm_mga_private_t *dev_priv )
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
-       unsigned int dirty = sarea_priv->dirty ;
+       unsigned int dirty = sarea_priv->dirty;
        int rv = 0;
 
-       buf_priv->dirty = sarea_priv->dirty;
-       buf_priv->WarpPipe = sarea_priv->WarpPipe;
+       if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+               sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
 
-       if (dirty & MGASAREA_NEW_CONTEXT)
-               rv |= mgaCopyContext( dev_priv, buf_priv );
+       if (dirty & MGA_UPLOAD_CTX)
+               rv |= mgaVerifyContext( dev_priv );
 
-       if (dirty & MGASAREA_NEW_TEX0)
-               rv |= mgaCopyTex( dev_priv, buf_priv, 0 );
+       if (dirty & MGA_UPLOAD_TEX0)
+               rv |= mgaVerifyTex( dev_priv, 0 );
 
        if (dev_priv->chipset == MGA_CARD_TYPE_G400) 
        {          
-               if (dirty & MGASAREA_NEW_TEX1)
-                       rv |= mgaCopyTex( dev_priv, buf_priv, 1 );
+               if (dirty & MGA_UPLOAD_TEX1)
+                       rv |= mgaVerifyTex( dev_priv, 1 );
           
-               if (dirty & MGASAREA_NEW_PIPE) 
-                       rv |= (buf_priv->WarpPipe > MGA_MAX_G400_PIPES); 
+               if (dirty & MGA_UPLOAD_PIPE) 
+                       rv |= (sarea_priv->WarpPipe > MGA_MAX_G400_PIPES); 
        } 
        else 
        {
-               if (dirty & MGASAREA_NEW_PIPE) 
-                       rv |= (buf_priv->WarpPipe > MGA_MAX_G200_PIPES); 
+               if (dirty & MGA_UPLOAD_PIPE) 
+                       rv |= (sarea_priv->WarpPipe > MGA_MAX_G200_PIPES); 
        }         
 
        return rv == 0;
 }
 
+static int mgaVerifyIload( drm_mga_private_t *dev_priv, 
+                          unsigned long bus_address, 
+                          unsigned int dstOrg, int length )
+{
+       if(dstOrg < dev_priv->textureOffset ||
+          dstOrg + length > 
+          (dev_priv->textureOffset + dev_priv->textureSize)) {
+               return -EINVAL;
+       }
+       if(length % 64) {
+               return -EINVAL;
+       }
+       return 0;
+}
+
+/* This copies a 64 byte aligned agp region to the frambuffer
+ * with a standard blit, the ioctl needs to do checking */
+
+static void mga_dma_dispatch_tex_blit( drm_device_t *dev, 
+                                      unsigned long bus_address, 
+                                      int length, 
+                                      unsigned int destOrg )
+{
+       drm_mga_private_t *dev_priv = dev->dev_private;
+       int use_agp = PDEA_pagpxfer_enable | 0x00000001;
+       u16 y2;
+       PRIMLOCALS;
+    
+        y2 = length / 64;
+       PRIM_OVERFLOW(dev, dev_priv, 30);
+       PRIMGETPTR( dev_priv );
+
+       dev_priv->last_sync_tag = mga_create_sync_tag(dev);
+
+       PRIMOUTREG( MGAREG_DSTORG, destOrg);
+       PRIMOUTREG( MGAREG_MACCESS, 0x00000000);
+       DRM_DEBUG("srcorg : %lx\n", bus_address | use_agp);
+       PRIMOUTREG( MGAREG_SRCORG, (u32) bus_address | use_agp);
+       PRIMOUTREG( MGAREG_AR5, 64);  
+
+       PRIMOUTREG( MGAREG_PITCH, 64);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DWGCTL, MGA_COPY_CMD); 
+
+       PRIMOUTREG(MGAREG_AR0, 63);
+       PRIMOUTREG(MGAREG_AR3, 0);              
+       PRIMOUTREG(MGAREG_FXBNDRY, (63 << 16));
+       PRIMOUTREG(MGAREG_YDSTLEN+MGAREG_MGA_EXEC, y2);
+  
+       PRIMOUTREG( MGAREG_SRCORG, 0);
+       PRIMOUTREG( MGAREG_PITCH, dev_priv->stride / dev_priv->cpp);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DWGSYNC, dev_priv->last_sync_tag);
+       PRIMADVANCE(dev_priv);
+}
+
+static void mga_dma_dispatch_vertex(drm_device_t *dev, 
+                                   drm_buf_t *buf)
+{
+       drm_mga_private_t *dev_priv = dev->dev_private;
+       drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       unsigned long address = (unsigned long)buf->bus_address;
+       int length = buf->used; 
+       int use_agp = PDEA_pagpxfer_enable;
+       int i = 0;
+       int primary_needed;
+       PRIMLOCALS;
+
+       DRM_DEBUG("dispatch vertex %d addr 0x%lx, "
+                 "length 0x%x nbox %d dirty %x\n", 
+                 buf->idx, address, length, 
+                 sarea_priv->nbox, sarea_priv->dirty);
+
+
+       dev_priv->last_sync_tag = mga_create_sync_tag(dev);
+
+       if (buf_priv->discard) { 
+               buf_priv->my_freelist->age = dev_priv->last_sync_tag;
+               mga_freelist_put(dev, buf);
+       }
+
+
+       /* WARNING: if you change any of the state functions verify
+        * these numbers (Overestimating this doesn't hurt).  
+        */
+       primary_needed = (25+15+30+25+ 
+                         10 + 
+                         15 * MGA_NR_SAREA_CLIPRECTS);
+
+
+       PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+       mgaEmitState( dev_priv );
+
+       if (buf->used) {
+               do {
+                       if (i < sarea_priv->nbox) {
+                               DRM_DEBUG("idx %d Emit box %d/%d:"
+                                         "%d,%d - %d,%d\n", 
+                                         buf->idx,
+                                         i, sarea_priv->nbox,
+                                         sarea_priv->boxes[i].x1, 
+                                         sarea_priv->boxes[i].y1,
+                                         sarea_priv->boxes[i].x2, 
+                                         sarea_priv->boxes[i].y2);
+                               
+                               mgaEmitClipRect( dev_priv, 
+                                                &sarea_priv->boxes[i] );
+                       }
+                       
+                       PRIMGETPTR(dev_priv);
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG( MGAREG_SECADDRESS, 
+                                   ((__u32)address) | TT_VERTEX);
+                       PRIMOUTREG( MGAREG_SECEND, 
+                                   (((__u32)(address + length)) | 
+                                    use_agp));
+                       PRIMADVANCE( dev_priv );               
+               }  while (++i < sarea_priv->nbox);
+       }
+
+       PRIMGETPTR( dev_priv );
+       PRIMOUTREG(MGAREG_DMAPAD, 0);
+       PRIMOUTREG(MGAREG_DMAPAD, 0);
+       PRIMOUTREG(MGAREG_DMAPAD, 0);
+       PRIMOUTREG(MGAREG_DWGSYNC, dev_priv->last_sync_tag);   
+       PRIMADVANCE( dev_priv );
+}
+
 
+static void mga_dma_dispatch_clear( drm_device_t *dev, int flags, 
+                                   unsigned int clear_color,
+                                   unsigned int clear_zval )
+{
+       drm_mga_private_t *dev_priv = dev->dev_private;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       unsigned int *regs = sarea_priv->ContextState;
+       int nbox = sarea_priv->nbox;
+       drm_clip_rect_t *pbox = sarea_priv->boxes;
+       unsigned int cmd;
+       int i;
+       int primary_needed;
+       PRIMLOCALS;
+
+       if ( dev_priv->sgram ) 
+               cmd = MGA_CLEAR_CMD | DC_atype_blk;
+       else
+               cmd = MGA_CLEAR_CMD | DC_atype_rstr;
+   
+       primary_needed = nbox * 70;
+       if(primary_needed == 0) primary_needed = 70;
+       PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+       PRIMGETPTR( dev_priv );
+       dev_priv->last_sync_tag = mga_create_sync_tag(dev);
+   
+       for (i = 0 ; i < nbox ; i++) {
+               unsigned int height = pbox[i].y2 - pbox[i].y1;
+
+               DRM_DEBUG("dispatch clear %d,%d-%d,%d flags %x!\n",
+                         pbox[i].x1, pbox[i].y1, pbox[i].x2, 
+                         pbox[i].y2, flags);
+
+               if ( flags & MGA_FRONT ) {          
+                       DRM_DEBUG("clear front\n");
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG(MGAREG_YDSTLEN, (pbox[i].y1<<16)|height);
+                       PRIMOUTREG(MGAREG_FXBNDRY, (pbox[i].x2<<16)|pbox[i].x1);
+
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG(MGAREG_FCOL, clear_color);
+                       PRIMOUTREG(MGAREG_DSTORG, dev_priv->frontOffset);
+                       PRIMOUTREG(MGAREG_DWGCTL+MGAREG_MGA_EXEC, cmd );
+               }
+
+               if ( flags & MGA_BACK ) {
+                       DRM_DEBUG("clear back\n");
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG(MGAREG_YDSTLEN, (pbox[i].y1<<16)|height);
+                       PRIMOUTREG(MGAREG_FXBNDRY, (pbox[i].x2<<16)|pbox[i].x1);
+
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG(MGAREG_FCOL, clear_color);
+                       PRIMOUTREG(MGAREG_DSTORG, dev_priv->backOffset);
+                       PRIMOUTREG(MGAREG_DWGCTL+MGAREG_MGA_EXEC, cmd );
+               }
+
+               if ( flags & MGA_DEPTH ) {
+                       DRM_DEBUG("clear depth\n");
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG(MGAREG_YDSTLEN, (pbox[i].y1<<16)|height);
+                       PRIMOUTREG(MGAREG_FXBNDRY, (pbox[i].x2<<16)|pbox[i].x1);
+
+                       PRIMOUTREG( MGAREG_DMAPAD, 0);
+                       PRIMOUTREG(MGAREG_FCOL, clear_zval);
+                       PRIMOUTREG(MGAREG_DSTORG, dev_priv->depthOffset);
+                       PRIMOUTREG(MGAREG_DWGCTL+MGAREG_MGA_EXEC, cmd );
+               }
+       }
+
+       /* Force reset of DWGCTL */
+       PRIMOUTREG( MGAREG_DMAPAD, 0);   
+       PRIMOUTREG( MGAREG_DMAPAD, 0);   
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL] );
+
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DWGSYNC, dev_priv->last_sync_tag);
+       PRIMADVANCE(dev_priv);
+}
+
+static void mga_dma_dispatch_swap( drm_device_t *dev )
+{
+       drm_mga_private_t *dev_priv = dev->dev_private;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       unsigned int *regs = sarea_priv->ContextState;
+       int nbox = sarea_priv->nbox;
+       drm_clip_rect_t *pbox = sarea_priv->boxes;
+       int i;
+       int primary_needed;
+       PRIMLOCALS;
+
+       primary_needed = nbox * 5;
+       primary_needed += 60;
+       PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+       PRIMGETPTR( dev_priv );
+   
+       dev_priv->last_sync_tag = mga_create_sync_tag(dev);
+
+       PRIMOUTREG(MGAREG_DSTORG, dev_priv->frontOffset);
+       PRIMOUTREG(MGAREG_MACCESS, dev_priv->mAccess);
+       PRIMOUTREG(MGAREG_SRCORG, dev_priv->backOffset);
+       PRIMOUTREG(MGAREG_AR5, dev_priv->stride/2);  
+
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG(MGAREG_DWGCTL, MGA_COPY_CMD); 
+            
+       for (i = 0 ; i < nbox; i++) {
+               unsigned int h = pbox[i].y2 - pbox[i].y1;
+               unsigned int start = pbox[i].y1 * dev_priv->stride/2;
+               
+               DRM_DEBUG("dispatch swap %d,%d-%d,%d!\n",
+                         pbox[i].x1, pbox[i].y1,
+                         pbox[i].x2, pbox[i].y2);
+
+               PRIMOUTREG(MGAREG_AR0, start + pbox[i].x2 - 1);
+               PRIMOUTREG(MGAREG_AR3, start + pbox[i].x1);             
+               PRIMOUTREG(MGAREG_FXBNDRY, pbox[i].x1|((pbox[i].x2 - 1)<<16));
+               PRIMOUTREG(MGAREG_YDSTLEN+MGAREG_MGA_EXEC, (pbox[i].y1<<16)|h);
+       }
+
+       /* Force reset of DWGCTL */
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL] );
+
+       PRIMOUTREG( MGAREG_SRCORG, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DMAPAD, 0);
+       PRIMOUTREG( MGAREG_DWGSYNC, dev_priv->last_sync_tag);
+       PRIMADVANCE(dev_priv);
+}
+
+int mga_clear_bufs(struct inode *inode, struct file *filp,
+                  unsigned int cmd, unsigned long arg)
+{
+       drm_file_t *priv = filp->private_data;
+       drm_device_t *dev = priv->dev;
+       drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       __volatile__ unsigned int *status = 
+               (__volatile__ unsigned int *)dev_priv->status_page;
+       drm_mga_clear_t clear;
+
+       copy_from_user_ret(&clear, (drm_mga_clear_t *)arg, sizeof(clear), 
+                          -EFAULT);
+
+       if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+               DRM_ERROR("mga_clear_bufs called without lock held\n");
+               return -EINVAL;
+       }
+   
+       if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+               sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+       /* Make sure we restore the 3D state next time.
+        */
+       dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CTX;
+       mga_dma_dispatch_clear( dev, clear.flags, 
+                               clear.clear_color, 
+                               clear.clear_depth );
+       PRIMUPDATE(dev_priv);
+       mga_dma_schedule(dev, 1);
+       sarea_priv->last_dispatch = status[1];
+       return 0;
+}
+
+int mga_swap_bufs(struct inode *inode, struct file *filp,
+                 unsigned int cmd, unsigned long arg)
+{
+       drm_file_t *priv = filp->private_data;
+       drm_device_t *dev = priv->dev;
+       drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       __volatile__ unsigned int *status = 
+               (__volatile__ unsigned int *)dev_priv->status_page;
+   
+       if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+               DRM_ERROR("mga_swap_bufs called without lock held\n");
+               return -EINVAL;
+       }
+
+       if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+               sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+       /* Make sure we restore the 3D state next time.
+        */
+       dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CTX;
+       mga_dma_dispatch_swap( dev );
+       PRIMUPDATE(dev_priv);
+       set_bit(0, &dev_priv->current_prim->swap_pending);
+       dev_priv->current_prim->swap_pending = 1;
+       mga_dma_schedule(dev, 1);
+       sarea_priv->last_dispatch = status[1];
+       return 0;
+}
+
+int mga_iload(struct inode *inode, struct file *filp,
+             unsigned int cmd, unsigned long arg)
+{
+       drm_file_t *priv = filp->private_data;
+       drm_device_t *dev = priv->dev;
+       drm_device_dma_t  *dma      = dev->dma;
+               drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+               drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+               __volatile__ unsigned int *status = 
+               (__volatile__ unsigned int *)dev_priv->status_page;
+       drm_buf_t *buf;
+       drm_mga_buf_priv_t *buf_priv;
+       drm_mga_iload_t iload;
+       unsigned long bus_address;
+   
+       DRM_DEBUG("Starting Iload\n");
+       copy_from_user_ret(&iload, (drm_mga_iload_t *)arg, sizeof(iload),
+                          -EFAULT);
+
+       if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+               DRM_ERROR("mga_iload called without lock held\n");
+               return -EINVAL;
+       }
+
+       buf = dma->buflist[ iload.idx ];
+       buf_priv = buf->dev_private;
+       bus_address = buf->bus_address;
+       DRM_DEBUG("bus_address %lx, length %d, destorg : %x\n",
+              bus_address, iload.length, iload.destOrg);
+   
+       if(mgaVerifyIload(dev_priv, 
+                         bus_address,
+                         iload.destOrg,  
+                         iload.length)) {
+               mga_freelist_put(dev, buf);
+               return -EINVAL;
+       }
+    
+       sarea_priv->dirty |= MGA_UPLOAD_CTX;
+
+       mga_dma_dispatch_tex_blit(dev, bus_address, iload.length, 
+                                 iload.destOrg);
+       buf_priv->my_freelist->age = dev_priv->last_sync_tag;
+       buf_priv->discard = 1;
+       mga_freelist_put(dev, buf);
+       mga_dma_schedule(dev, 1);
+       sarea_priv->last_dispatch = status[1];
+       return 0; 
+}
+
+int mga_vertex(struct inode *inode, struct file *filp,
+              unsigned int cmd, unsigned long arg)
+{
+       drm_file_t *priv = filp->private_data;
+       drm_device_t *dev = priv->dev;
+       drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       __volatile__ unsigned int *status = 
+               (__volatile__ unsigned int *)dev_priv->status_page;
+       drm_device_dma_t *dma = dev->dma;
+       drm_buf_t *buf;
+       drm_mga_buf_priv_t *buf_priv;
+       drm_mga_vertex_t vertex;
+
+       copy_from_user_ret(&vertex, (drm_mga_vertex_t *)arg, sizeof(vertex),
+                          -EFAULT);
+   
+       if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+               DRM_ERROR("mga_vertex called without lock held\n");
+               return -EINVAL;
+       }
+
+       DRM_DEBUG("mga_vertex\n");
+
+       buf = dma->buflist[ vertex.idx ];
+       buf_priv = buf->dev_private;
+
+       buf->used = vertex.used;
+       buf_priv->discard = vertex.discard;
+   
+       if (!mgaVerifyState(dev_priv)) {
+          if (vertex.discard) { 
+               buf_priv->my_freelist->age = dev_priv->last_sync_tag;
+               mga_freelist_put(dev, buf);
+          }
+          return -EINVAL;
+       }
+
+       mga_dma_dispatch_vertex(dev, buf);
+
+       PRIMUPDATE(dev_priv);
+       mga_dma_schedule(dev, 1);
+       sarea_priv->last_dispatch = status[1];
+       return 0;
+}
+
+static int mga_dma_get_buffers(drm_device_t *dev, drm_dma_t *d)
+{
+       int i;
+       drm_buf_t *buf;
+
+       for (i = d->granted_count; i < d->request_count; i++) {
+               buf = mga_freelist_get(dev);
+               if (!buf) break;
+               buf->pid = current->pid;
+               copy_to_user_ret(&d->request_indices[i],
+                                &buf->idx,
+                                sizeof(buf->idx),
+                                -EFAULT);
+               copy_to_user_ret(&d->request_sizes[i],
+                                &buf->total,
+                                sizeof(buf->total),
+                                -EFAULT);
+               ++d->granted_count;
+       }
+       return 0;
+}
+
+int mga_dma(struct inode *inode, struct file *filp, unsigned int cmd,
+           unsigned long arg)
+{
+       drm_file_t        *priv     = filp->private_data;
+       drm_device_t      *dev      = priv->dev;
+       drm_device_dma_t  *dma      = dev->dma;
+       drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+       drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       __volatile__ unsigned int *status = 
+               (__volatile__ unsigned int *)dev_priv->status_page;
+       int               retcode   = 0;
+       drm_dma_t         d;
+
+       copy_from_user_ret(&d, (drm_dma_t *)arg, sizeof(d), -EFAULT);
+       DRM_DEBUG("%d %d: %d send, %d req\n",
+                 current->pid, d.context, d.send_count, d.request_count);
+
+       if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+               DRM_ERROR("mga_dma called without lock held\n");
+               return -EINVAL;
+       }
+
+       /* Please don't send us buffers.
+        */
+       if (d.send_count != 0) {
+               DRM_ERROR("Process %d trying to send %d buffers via drmDMA\n",
+                         current->pid, d.send_count);
+               return -EINVAL;
+       }
+       
+       /* We'll send you buffers.
+        */
+       if (d.request_count < 0 || d.request_count > dma->buf_count) {
+               DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
+                         current->pid, d.request_count, dma->buf_count);
+               return -EINVAL;
+       }
+       
+       d.granted_count = 0;
+
+       if (d.request_count) {
+               retcode = mga_dma_get_buffers(dev, &d);
+       }
+
+       DRM_DEBUG("%d returning, granted = %d\n",
+                 current->pid, d.granted_count);
+       copy_to_user_ret((drm_dma_t *)arg, &d, sizeof(d), -EFAULT);
+       sarea_priv->last_dispatch = status[1];
+       return retcode;
+}