vserver 1.9.5.x5

[linux-2.6.git] / drivers / char / drm / r128_state.c

diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c
index adc3266..60c7743 100644 (file)
--- a/drivers/char/drm/r128_state.c
+++ b/drivers/char/drm/r128_state.c
@@ -27,12 +27,32 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-#include "r128.h"
 #include "drmP.h"
 #include "drm.h"
 #include "r128_drm.h"
 #include "r128_drv.h"
 
+drm_ioctl_desc_t r128_ioctls[] = {
+       [DRM_IOCTL_NR(DRM_R128_INIT)]       = { r128_cce_init,     1, 1 },
+       [DRM_IOCTL_NR(DRM_R128_CCE_START)]  = { r128_cce_start,    1, 1 },
+       [DRM_IOCTL_NR(DRM_R128_CCE_STOP)]   = { r128_cce_stop,     1, 1 },
+       [DRM_IOCTL_NR(DRM_R128_CCE_RESET)]  = { r128_cce_reset,    1, 1 },
+       [DRM_IOCTL_NR(DRM_R128_CCE_IDLE)]   = { r128_cce_idle,     1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_RESET)]      = { r128_engine_reset, 1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_FULLSCREEN)] = { r128_fullscreen,   1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_SWAP)]       = { r128_cce_swap,     1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_FLIP)]       = { r128_cce_flip,     1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_CLEAR)]      = { r128_cce_clear,    1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_VERTEX)]     = { r128_cce_vertex,   1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_INDICES)]    = { r128_cce_indices,  1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_BLIT)]       = { r128_cce_blit,     1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_DEPTH)]      = { r128_cce_depth,    1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_STIPPLE)]    = { r128_cce_stipple,  1, 0 },
+       [DRM_IOCTL_NR(DRM_R128_INDIRECT)]   = { r128_cce_indirect, 1, 1 },
+       [DRM_IOCTL_NR(DRM_R128_GETPARAM)]   = { r128_getparam, 1, 0 },
+};
+
+int r128_max_ioctl = DRM_ARRAY_SIZE(r128_ioctls);
 
 /* ================================================================
  * CCE hardware state programming functions
@@ -926,24 +946,24 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
        }
 
        buffer_size = depth->n * sizeof(u32);
-       buffer = DRM_MALLOC( buffer_size );
+       buffer = drm_alloc( buffer_size, DRM_MEM_BUFS );
        if ( buffer == NULL )
                return DRM_ERR(ENOMEM);
        if ( DRM_COPY_FROM_USER( buffer, depth->buffer, buffer_size ) ) {
-               DRM_FREE( buffer, buffer_size);
+               drm_free( buffer, buffer_size, DRM_MEM_BUFS);
                return DRM_ERR(EFAULT);
        }
 
        mask_size = depth->n * sizeof(u8);
        if ( depth->mask ) {
-               mask = DRM_MALLOC( mask_size );
+               mask = drm_alloc( mask_size, DRM_MEM_BUFS );
                if ( mask == NULL ) {
-                       DRM_FREE( buffer, buffer_size );
+                       drm_free( buffer, buffer_size, DRM_MEM_BUFS );
                        return DRM_ERR(ENOMEM);
                }
                if ( DRM_COPY_FROM_USER( mask, depth->mask, mask_size ) ) {
-                       DRM_FREE( buffer, buffer_size );
-                       DRM_FREE( mask, mask_size );
+                       drm_free( buffer, buffer_size, DRM_MEM_BUFS );
+                       drm_free( mask, mask_size, DRM_MEM_BUFS );
                        return DRM_ERR(EFAULT);
                }
 
@@ -970,7 +990,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
                        }
                }
 
-               DRM_FREE( mask, mask_size );
+               drm_free( mask, mask_size, DRM_MEM_BUFS );
        } else {
                for ( i = 0 ; i < count ; i++, x++ ) {
                        BEGIN_RING( 6 );
@@ -994,7 +1014,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
                }
        }
 
-       DRM_FREE( buffer, buffer_size );
+       drm_free( buffer, buffer_size, DRM_MEM_BUFS );
 
        return 0;
 }
@@ -1016,54 +1036,54 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
 
        xbuf_size = count * sizeof(*x);
        ybuf_size = count * sizeof(*y);
-       x = DRM_MALLOC( xbuf_size );
+       x = drm_alloc( xbuf_size, DRM_MEM_BUFS );
        if ( x == NULL ) {
                return DRM_ERR(ENOMEM);
        }
-       y = DRM_MALLOC( ybuf_size );
+       y = drm_alloc( ybuf_size, DRM_MEM_BUFS );
        if ( y == NULL ) {
-               DRM_FREE( x, xbuf_size );
+               drm_free( x, xbuf_size, DRM_MEM_BUFS );
                return DRM_ERR(ENOMEM);
        }
        if ( DRM_COPY_FROM_USER( x, depth->x, xbuf_size ) ) {
-               DRM_FREE( x, xbuf_size );
-               DRM_FREE( y, ybuf_size );
+               drm_free( x, xbuf_size, DRM_MEM_BUFS );
+               drm_free( y, ybuf_size, DRM_MEM_BUFS );
                return DRM_ERR(EFAULT);
        }
        if ( DRM_COPY_FROM_USER( y, depth->y, xbuf_size ) ) {
-               DRM_FREE( x, xbuf_size );
-               DRM_FREE( y, ybuf_size );
+               drm_free( x, xbuf_size, DRM_MEM_BUFS );
+               drm_free( y, ybuf_size, DRM_MEM_BUFS );
                return DRM_ERR(EFAULT);
        }
 
        buffer_size = depth->n * sizeof(u32);
-       buffer = DRM_MALLOC( buffer_size );
+       buffer = drm_alloc( buffer_size, DRM_MEM_BUFS );
        if ( buffer == NULL ) {
-               DRM_FREE( x, xbuf_size );
-               DRM_FREE( y, ybuf_size );
+               drm_free( x, xbuf_size, DRM_MEM_BUFS );
+               drm_free( y, ybuf_size, DRM_MEM_BUFS );
                return DRM_ERR(ENOMEM);
        }
        if ( DRM_COPY_FROM_USER( buffer, depth->buffer, buffer_size ) ) {
-               DRM_FREE( x, xbuf_size );
-               DRM_FREE( y, ybuf_size );
-               DRM_FREE( buffer, buffer_size );
+               drm_free( x, xbuf_size, DRM_MEM_BUFS );
+               drm_free( y, ybuf_size, DRM_MEM_BUFS );
+               drm_free( buffer, buffer_size, DRM_MEM_BUFS );
                return DRM_ERR(EFAULT);
        }
 
        if ( depth->mask ) {
                mask_size = depth->n * sizeof(u8);
-               mask = DRM_MALLOC( mask_size );
+               mask = drm_alloc( mask_size, DRM_MEM_BUFS );
                if ( mask == NULL ) {
-                       DRM_FREE( x, xbuf_size );
-                       DRM_FREE( y, ybuf_size );
-                       DRM_FREE( buffer, buffer_size );
+                       drm_free( x, xbuf_size, DRM_MEM_BUFS );
+                       drm_free( y, ybuf_size, DRM_MEM_BUFS );
+                       drm_free( buffer, buffer_size, DRM_MEM_BUFS );
                        return DRM_ERR(ENOMEM);
                }
                if ( DRM_COPY_FROM_USER( mask, depth->mask, mask_size ) ) {
-                       DRM_FREE( x, xbuf_size );
-                       DRM_FREE( y, ybuf_size );
-                       DRM_FREE( buffer, buffer_size );
-                       DRM_FREE( mask, mask_size );
+                       drm_free( x, xbuf_size, DRM_MEM_BUFS  );
+                       drm_free( y, ybuf_size, DRM_MEM_BUFS  );
+                       drm_free( buffer, buffer_size, DRM_MEM_BUFS  );
+                       drm_free( mask, mask_size, DRM_MEM_BUFS  );
                        return DRM_ERR(EFAULT);
                }
 
@@ -1090,7 +1110,7 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
                        }
                }
 
-               DRM_FREE( mask, mask_size );
+               drm_free( mask, mask_size, DRM_MEM_BUFS );
        } else {
                for ( i = 0 ; i < count ; i++ ) {
                        BEGIN_RING( 6 );
@@ -1114,9 +1134,9 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
                }
        }
 
-       DRM_FREE( x, xbuf_size );
-       DRM_FREE( y, ybuf_size );
-       DRM_FREE( buffer, buffer_size );
+       drm_free( x, xbuf_size, DRM_MEM_BUFS );
+       drm_free( y, ybuf_size, DRM_MEM_BUFS );
+       drm_free( buffer, buffer_size, DRM_MEM_BUFS );
 
        return 0;
 }
@@ -1184,23 +1204,23 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
 
        xbuf_size = count * sizeof(*x);
        ybuf_size = count * sizeof(*y);
-       x = DRM_MALLOC( xbuf_size );
+       x = drm_alloc( xbuf_size, DRM_MEM_BUFS );
        if ( x == NULL ) {
                return DRM_ERR(ENOMEM);
        }
-       y = DRM_MALLOC( ybuf_size );
+       y = drm_alloc( ybuf_size, DRM_MEM_BUFS );
        if ( y == NULL ) {
-               DRM_FREE( x, xbuf_size );
+               drm_free( x, xbuf_size, DRM_MEM_BUFS );
                return DRM_ERR(ENOMEM);
        }
        if ( DRM_COPY_FROM_USER( x, depth->x, xbuf_size ) ) {
-               DRM_FREE( x, xbuf_size );
-               DRM_FREE( y, ybuf_size );
+               drm_free( x, xbuf_size, DRM_MEM_BUFS );
+               drm_free( y, ybuf_size, DRM_MEM_BUFS );
                return DRM_ERR(EFAULT);
        }
        if ( DRM_COPY_FROM_USER( y, depth->y, ybuf_size ) ) {
-               DRM_FREE( x, xbuf_size );
-               DRM_FREE( y, ybuf_size );
+               drm_free( x, xbuf_size, DRM_MEM_BUFS );
+               drm_free( y, ybuf_size, DRM_MEM_BUFS );
                return DRM_ERR(EFAULT);
        }
 
@@ -1228,8 +1248,8 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
                ADVANCE_RING();
        }
 
-       DRM_FREE( x, xbuf_size );
-       DRM_FREE( y, ybuf_size );
+       drm_free( x, xbuf_size, DRM_MEM_BUFS );
+       drm_free( y, ybuf_size, DRM_MEM_BUFS );
 
        return 0;
 }
@@ -1695,7 +1715,7 @@ int r128_getparam( DRM_IOCTL_ARGS )
        return 0;
 }
 
-static void r128_driver_prerelease(drm_device_t *dev, DRMFILE filp)
+void r128_driver_prerelease(drm_device_t *dev, DRMFILE filp)
 {
        if ( dev->dev_private ) {
                drm_r128_private_t *dev_priv = dev->dev_private;
@@ -1705,20 +1725,8 @@ static void r128_driver_prerelease(drm_device_t *dev, DRMFILE filp)
        }                       
 }
 
-static void r128_driver_pretakedown(drm_device_t *dev)
+void r128_driver_pretakedown(drm_device_t *dev)
 {
        r128_do_cleanup_cce( dev );
 }
 
-void r128_driver_register_fns(drm_device_t *dev)
-{
-       dev->driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL;
-       dev->dev_priv_size = sizeof(drm_r128_buf_priv_t);
-       dev->fn_tbl.prerelease = r128_driver_prerelease;
-       dev->fn_tbl.pretakedown = r128_driver_pretakedown;
-       dev->fn_tbl.vblank_wait = r128_driver_vblank_wait;
-       dev->fn_tbl.irq_preinstall = r128_driver_irq_preinstall;
-       dev->fn_tbl.irq_postinstall = r128_driver_irq_postinstall;
-       dev->fn_tbl.irq_uninstall = r128_driver_irq_uninstall;
-       dev->fn_tbl.irq_handler = r128_driver_irq_handler;
-}