diff options
| author | anholt <anholt@FreeBSD.org> | 2005-07-20 21:10:57 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2005-07-20 21:10:57 +0000 |
| commit | e1ade9ca6498184181b67d270742352e2abb44fc (patch) | |
| tree | f8d5015ba84b81c23a865931ee1d2e95b5838c57 /sys/dev/drm/drmP.h | |
| parent | c07c4936d791dbb94e9540ad2676c718f7459a15 (diff) | |
| download | FreeBSD-src-e1ade9ca6498184181b67d270742352e2abb44fc.zip FreeBSD-src-e1ade9ca6498184181b67d270742352e2abb44fc.tar.gz | |
Add the latest r300 code from r300.sf.net. This is based on the patch supplied
by Vladimir Dergachev for inclusion in DRM CVS, with minor modifications for
FreeBSD CVS and the appropriate license from Nicolai Haehnle on r300_reg.h.
Fixes hangs when using r300.sf.net userland, tested on a Radeon 9600 on amd64.
Diffstat (limited to 'sys/dev/drm/drmP.h')
| -rw-r--r-- | sys/dev/drm/drmP.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h index 4d00edc..d17cabf 100644 --- a/sys/dev/drm/drmP.h +++ b/sys/dev/drm/drmP.h @@ -252,6 +252,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; @@ -821,8 +830,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); void drm_agp_do_release(void); @@ -842,7 +852,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); |
