diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2001-11-27 11:48:31 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-11-27 11:48:31 +0000 |
| commit | cf438cfe778a44c320aebb04ccb3f2fd2244bbe1 (patch) | |
| tree | 0f320dfc596a8ef0ae4c2570de0cf5d4bc621b31 | |
| parent | f8f0bcfc2d56fe5437bc07dcc4655f85b380252e (diff) | |
Put back i810 drm major number, add stub irq functions for backwards
compatibility.
| -rw-r--r-- | linux-core/i810_drv.c | 9 | ||||
| -rw-r--r-- | linux/i810.h | 17 | ||||
| -rw-r--r-- | linux/i810_drv.c | 9 |
3 files changed, 22 insertions, 13 deletions
diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c index 61c30ffb..d926acfc 100644 --- a/linux-core/i810_drv.c +++ b/linux-core/i810_drv.c @@ -43,14 +43,13 @@ /* Interface history * - * 1.0 - * 2.0 - Security fixes. - * 2.1 - Add i810_dma_vertex2 ioctl, + * 1.1 - XFree 4.1 + * 1.2 - Add i810_dma_vertex2 ioctl, * - Disable copying code (leave stub ioctls for backwards compatibility) * */ -#define DRIVER_MAJOR 2 -#define DRIVER_MINOR 1 +#define DRIVER_MAJOR 1 +#define DRIVER_MINOR 2 #define DRIVER_PATCHLEVEL 0 #define DRIVER_IOCTLS \ diff --git a/linux/i810.h b/linux/i810.h index 4a7f5207..c4d57ea7 100644 --- a/linux/i810.h +++ b/linux/i810.h @@ -60,9 +60,20 @@ i810_dma_quiescent( dev ); \ } while (0) -#define __HAVE_DMA_IRQ 0 -#define __HAVE_DMA_IRQ_BH 0 -#define __HAVE_SHARED_IRQ 1 +/* Don't need an irq any more, but this must be kept around for + * backwards compatibility. (Could override the core drm ioctls + * somehow to just return success, but this does the job). + * + * This is pretty hacky: the return's jump out of the drm core + * functions before the irq is allocated or deallocated. Noops might + * be cleaner. + */ +#define __HAVE_DMA_IRQ 1 +#define __HAVE_DMA_IRQ_BH 1 /* ??? */ +#define __HAVE_SHARED_IRQ 1 +#define DRIVER_PREINSTALL() return 0 +#define DRIVER_POSTINSTALL() return 0 +#define DRIVER_UNINSTALL() return 0 /* Buffer customization: */ diff --git a/linux/i810_drv.c b/linux/i810_drv.c index 61c30ffb..d926acfc 100644 --- a/linux/i810_drv.c +++ b/linux/i810_drv.c @@ -43,14 +43,13 @@ /* Interface history * - * 1.0 - * 2.0 - Security fixes. - * 2.1 - Add i810_dma_vertex2 ioctl, + * 1.1 - XFree 4.1 + * 1.2 - Add i810_dma_vertex2 ioctl, * - Disable copying code (leave stub ioctls for backwards compatibility) * */ -#define DRIVER_MAJOR 2 -#define DRIVER_MINOR 1 +#define DRIVER_MAJOR 1 +#define DRIVER_MINOR 2 #define DRIVER_PATCHLEVEL 0 #define DRIVER_IOCTLS \ |