diff options
| author | David Dawes <dawes@xfree86.org> | 2002-02-14 02:00:26 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2002-02-14 02:00:26 +0000 |
| commit | ab87c5d0d1b5c35006ce8b99a9260e3116c732dc (patch) | |
| tree | 24d25b8fa4987897180d249b671ac2ab9e8edab1 /linux/gamma_drv.c | |
| parent | 65d25572deec33b7da13c211bf0aa78c361f535a (diff) | |
First pass of mesa-4-0 branch merge into trunk.
Diffstat (limited to 'linux/gamma_drv.c')
| -rw-r--r-- | linux/gamma_drv.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c index c05465c5..58cea241 100644 --- a/linux/gamma_drv.c +++ b/linux/gamma_drv.c @@ -38,15 +38,19 @@ #define DRIVER_NAME "gamma" #define DRIVER_DESC "3DLabs gamma" -#define DRIVER_DATE "20010216" +#define DRIVER_DATE "20010624" -#define DRIVER_MAJOR 1 +#define DRIVER_MAJOR 2 #define DRIVER_MINOR 0 #define DRIVER_PATCHLEVEL 0 #define DRIVER_IOCTLS \ - [DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { gamma_dma, 1, 0 } + [DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { gamma_dma, 1, 0 }, \ + [DRM_IOCTL_NR(DRM_IOCTL_GAMMA_INIT)] = { gamma_dma_init, 1, 1 }, \ + [DRM_IOCTL_NR(DRM_IOCTL_GAMMA_COPY)] = { gamma_dma_copy, 1, 1 } +#define IOCTL_TABLE_NAME DRM(ioctls) +#define IOCTL_FUNC_NAME DRM(ioctl) #define __HAVE_COUNTERS 5 #define __HAVE_COUNTER6 _DRM_STAT_IRQ @@ -57,6 +61,7 @@ #include "drm_auth.h" +#include "drm_agpsupport.h" #include "drm_bufs.h" #include "drm_context.h" #include "drm_dma.h" @@ -82,7 +87,6 @@ static int __init gamma_options( char *str ) __setup( DRIVER_NAME "=", gamma_options ); #endif - #include "drm_fops.h" #include "drm_init.h" #include "drm_ioctl.h" |