diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-12 08:55:51 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-12 08:55:51 -0700 |
| commit | e7b97f552390319d817595da8accefbe56199346 (patch) | |
| tree | bbf84467b34e7041e2cee218441871d0518046e7 /linux-core/drmP.h | |
| parent | f2e3d790ac05b2792e795f47fee32fe896a096cc (diff) | |
| parent | cf016891435a0aa74dc4909ed4125c7ed906b7d1 (diff) | |
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 25fc8733..0d0ec992 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -75,7 +75,6 @@ #include <linux/poll.h> #include <asm/pgalloc.h> #include "drm.h" -#include "drm_crtc.h" #include <linux/slab.h> #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) @@ -590,9 +589,13 @@ typedef struct drm_vbl_sig { #define DRM_ATI_GART_MAIN 1 #define DRM_ATI_GART_FB 2 +#define DRM_ATI_GART_PCI 1 +#define DRM_ATI_GART_PCIE 2 +#define DRM_ATI_GART_IGP 3 + typedef struct ati_pcigart_info { int gart_table_location; - int is_pcie; + int gart_reg_if; void *addr; dma_addr_t bus_addr; drm_local_map_t mapping; |