diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-08-17 13:10:05 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-08-17 13:10:05 +0000 |
| commit | 5c9ed8309493acb099463d25b32fabb5b7c004af (patch) | |
| tree | eec5be6f9374b5a2f61d52bd02ba0a44ba7e636d /linux/i830.h | |
| parent | 93e8c201afac565942f9d3523ac808d3220d6d0e (diff) | |
Merged drmfntbl-0-0-1
Diffstat (limited to 'linux/i830.h')
| -rw-r--r-- | linux/i830.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/linux/i830.h b/linux/i830.h index 56f7a116..7e176f2c 100644 --- a/linux/i830.h +++ b/linux/i830.h @@ -83,30 +83,12 @@ #define __HAVE_COUNTER8 _DRM_STAT_SECONDARY #define __HAVE_COUNTER9 _DRM_STAT_DMA -/* Driver customization: - */ -#define __HAVE_RELEASE 1 -#define DRIVER_RELEASE() do { \ - i830_reclaim_buffers( filp ); \ -} while (0) - -#define DRIVER_PRETAKEDOWN( dev ) do { \ - i830_dma_cleanup( dev ); \ -} while (0) - /* DMA customization: */ #define __HAVE_DMA 1 #define __HAVE_DMA_QUEUE 1 -#define __HAVE_DMA_WAITLIST 0 #define __HAVE_DMA_RECLAIM 1 -#define __HAVE_DMA_QUIESCENT 1 -#define DRIVER_DMA_QUIESCENT() do { \ - i830_dma_quiescent( dev ); \ -} while (0) - - /* Driver will work either way: IRQ's save cpu time when waiting for * the card, but are subject to subtle interactions between bios, * hardware and the driver. @@ -121,13 +103,4 @@ #define __HAVE_IRQ 0 #endif - -/* Buffer customization: - */ - -#define DRIVER_BUF_PRIV_T drm_i830_buf_priv_t - -#define DRIVER_AGP_BUFFERS_MAP( dev ) \ - ((drm_i830_private_t *)((dev)->dev_private))->buffer_map - #endif |