diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-03-25 00:29:14 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-03-25 00:29:14 +0000 |
| commit | c14006ba9f0522875327998215150067d8ca6ea7 (patch) | |
| tree | 08290dadd19103f357082bbd51dc9d6cea5f648a /shared/radeon.h | |
| parent | 0bd0dd2300e91707ae5a41a83eb37217fd8ad295 (diff) | |
XFree86 4.3.0 mergeX_4_3_0-20030324-merge
Diffstat (limited to 'shared/radeon.h')
| -rw-r--r-- | shared/radeon.h | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/shared/radeon.h b/shared/radeon.h index c36accb4..fe71687a 100644 --- a/shared/radeon.h +++ b/shared/radeon.h @@ -51,7 +51,7 @@ #define DRIVER_DATE "20020828" #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 8 +#define DRIVER_MINOR 7 #define DRIVER_PATCHLEVEL 0 /* Interface history: @@ -77,7 +77,6 @@ * and R200_PP_CUBIC_OFFSET_F1_[0..5]. * Added packets R200_EMIT_PP_CUBIC_FACES_[0..5] and * R200_EMIT_PP_CUBIC_OFFSETS_[0..5]. (brian) - * 1.8 - Remove need to call cleanup ioctls on last client exit (keith) */ #define DRIVER_IOCTLS \ [DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { radeon_cp_buffers, 1, 0 }, \ @@ -106,6 +105,11 @@ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_IRQ_WAIT)] = { radeon_irq_wait, 1, 0 }, +#define USE_IRQS 1 +#if USE_IRQS +#define __HAVE_DMA_IRQ 1 +#define __HAVE_VBL_IRQ 1 +#define __HAVE_SHARED_IRQ 1 /* When a client dies: * - Check for and clean up flipped page state @@ -113,36 +117,35 @@ * * DRM infrastructure takes care of reclaiming dma buffers. */ -#define DRIVER_PRERELEASE() \ -do { \ +#define DRIVER_PRERELEASE() do { \ if ( dev->dev_private ) { \ drm_radeon_private_t *dev_priv = dev->dev_private; \ if ( dev_priv->page_flipping ) { \ radeon_do_cleanup_pageflip( dev ); \ } \ radeon_mem_release( dev_priv->agp_heap ); \ - radeon_mem_release( dev_priv->fb_heap ); \ } \ } while (0) -/* When the last client dies, shut down the CP and free dev->dev_priv. +/* On unloading the module: + * - Free memory heap structure + * - Remove mappings made at startup and free dev_private. */ -#define __HAVE_RELEASE 1 -#define DRIVER_RELEASE() \ -do { \ - DRM(reclaim_buffers)( dev, priv->pid ); \ - if ( dev->open_count == 1) \ - radeon_do_release( dev ); \ +#define DRIVER_PRETAKEDOWN() do { \ + if ( dev->dev_private ) { \ + drm_radeon_private_t *dev_priv = dev->dev_private; \ + radeon_mem_takedown( &(dev_priv->agp_heap) ); \ + radeon_do_cleanup_cp( dev ); \ + } \ } while (0) - +#else +#define __HAVE_DMA_IRQ 0 +#endif /* DMA customization: */ #define __HAVE_DMA 1 -#define __HAVE_DMA_IRQ 1 -#define __HAVE_VBL_IRQ 1 -#define __HAVE_SHARED_IRQ 1 /* Buffer customization: |