diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-07-20 21:17:47 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-07-20 21:17:47 +0000 |
| commit | ab59dd285c4ccdec92adadfcb869fc83edd96e86 (patch) | |
| tree | 991a507b2e9afee54d15bc60848c988d5d4b9666 /bsd-core/drmP.h | |
| parent | 026e12ea937865748d54d3b8a7a3b77ccc4e3efb (diff) | |
Add latest r300 support from r300.sf.net CVS. Patch submitted by volodya,
with BSD fix from jkim and the r300_reg.h license from Nicolai Haehnle.
Big thanks to everyone involved!
Diffstat (limited to 'bsd-core/drmP.h')
| -rw-r--r-- | bsd-core/drmP.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h index 88cf938b..ab6cc534 100644 --- a/bsd-core/drmP.h +++ b/bsd-core/drmP.h @@ -258,6 +258,15 @@ typedef drm_device_t *device_t; extern struct cfdriver drm_cd; #endif /* !__FreeBSD__ */ +/* Capabilities taken from src/sys/dev/pci/pcireg.h. */ +#ifndef PCIY_AGP +#define PCIY_AGP 0x02 +#endif + +#ifndef PCIY_EXPRESS +#define PCIY_EXPRESS 0x10 +#endif + typedef unsigned long dma_addr_t; typedef u_int32_t u32; typedef u_int16_t u16; @@ -854,8 +863,9 @@ void drm_driver_irq_uninstall(drm_device_t *dev); int drm_vblank_wait(drm_device_t *dev, unsigned int *vbl_seq); void drm_vbl_send_signals(drm_device_t *dev); -/* AGP/GART support (drm_agpsupport.c) */ +/* AGP/PCI Express/GART support (drm_agpsupport.c) */ int drm_device_is_agp(drm_device_t *dev); +int drm_device_is_pcie(drm_device_t *dev); drm_agp_head_t *drm_agp_init(void); void drm_agp_uninit(void); int drm_agp_acquire(drm_device_t *dev); @@ -882,7 +892,7 @@ extern int drm_sysctl_cleanup(drm_device_t *dev); /* ATI PCIGART support (ati_pcigart.c) */ int drm_ati_pcigart_init(drm_device_t *dev, unsigned long *addr, - dma_addr_t *bus_addr); + dma_addr_t *bus_addr, int is_pcie); int drm_ati_pcigart_cleanup(drm_device_t *dev, unsigned long addr, dma_addr_t bus_addr); |