diff options
| author | Rik Faith <faith@alephnull.com> | 2000-07-21 16:57:00 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-07-21 16:57:00 +0000 |
| commit | 6dd96a15ed329f26565bb971877f03e15801f3f5 (patch) | |
| tree | ce5281124fcdfa73c27d775428c5e7432ec50e2b /linux-core/drmP.h | |
| parent | e38b34e54a79919588f23294ddb326309c9cb005 (diff) | |
Revert some changes and try alternative way to clean up AGP handling.
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index ce55c15b..d8791bf9 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -50,7 +50,10 @@ #ifdef CONFIG_MTRR #include <asm/mtrr.h> #endif -#ifdef CONFIG_DRM_AGP +#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) +#define DRM_AGP +#endif +#ifdef DRM_AGP #include <linux/types.h> #include <linux/agp_backend.h> #endif @@ -407,7 +410,7 @@ typedef struct drm_device_dma { wait_queue_head_t waiting; /* Processes waiting on free bufs */ } drm_device_dma_t; -#ifdef CONFIG_DRM_AGP +#ifdef DRM_AGP typedef struct drm_agp_mem { unsigned long handle; agp_memory *memory; @@ -521,7 +524,7 @@ typedef struct drm_device { wait_queue_head_t buf_readers; /* Processes waiting to read */ wait_queue_head_t buf_writers; /* Processes waiting to ctx switch */ -#ifdef CONFIG_DRM_AGP +#ifdef DRM_AGP drm_agp_head_t *agp; #endif unsigned long *ctx_bitmap; @@ -598,7 +601,7 @@ extern void drm_free_pages(unsigned long address, int order, extern void *drm_ioremap(unsigned long offset, unsigned long size); extern void drm_ioremapfree(void *pt, unsigned long size); -#ifdef CONFIG_DRM_AGP +#ifdef DRM_AGP extern agp_memory *drm_alloc_agp(int pages, u32 type); extern int drm_free_agp(agp_memory *handle, int pages); extern int drm_bind_agp(agp_memory *handle, unsigned int start); @@ -722,7 +725,7 @@ extern void drm_ctxbitmap_cleanup(drm_device_t *dev); extern int drm_ctxbitmap_next(drm_device_t *dev); extern void drm_ctxbitmap_free(drm_device_t *dev, int ctx_handle); -#ifdef CONFIG_DRM_AGP +#ifdef DRM_AGP /* AGP/GART support (agpsupport.c) */ extern drm_agp_head_t *drm_agp_init(void); extern void drm_agp_uninit(void); |