diff options
author | Jeff Hartmann <jhartmann@valinux.com> | 2001-08-10 16:29:21 +0000 |
---|---|---|
committer | Jeff Hartmann <jhartmann@valinux.com> | 2001-08-10 16:29:21 +0000 |
commit | 97b8aa52bba602d5babe225983f7e4c7cb4d7492 (patch) | |
tree | 922882797ea335549c01849c4dd2cdc350938be0 /linux-core/drmP.h | |
parent | b6923b39539c34c2a589197def5eee72a9d719bf (diff) |
Commit Keith Owens kernel Makefile changes, merge and commit alpha patch
set from Jay Estabrook (sans some mga modifications which broke other
arch's.)
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r-- | linux-core/drmP.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 3b282685..8e2ecd16 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -624,6 +624,9 @@ typedef struct drm_sg_mem { void *virtual; int pages; struct page **pagelist; +#if defined(__alpha__) && (LINUX_VERSION_CODE >= 0x020400) + dma_addr_t *busaddr; +#endif } drm_sg_mem_t; typedef struct drm_sigdata { @@ -715,6 +718,7 @@ typedef struct drm_device { drm_agp_head_t *agp; #endif #ifdef __alpha__ + struct pci_dev *pdev; #if LINUX_VERSION_CODE < 0x020403 struct pci_controler *hose; #else @@ -1018,8 +1022,12 @@ extern int DRM(sg_free)(struct inode *inode, struct file *filp, #endif /* ATI PCIGART support (ati_pcigart.h) */ -extern unsigned long DRM(ati_pcigart_init)(drm_device_t *dev); -extern int DRM(ati_pcigart_cleanup)(unsigned long address); +extern int DRM(ati_pcigart_init)(drm_device_t *dev, + unsigned long *addr, + dma_addr_t *bus_addr); +extern int DRM(ati_pcigart_cleanup)(drm_device_t *dev, + unsigned long addr, + dma_addr_t bus_addr); #endif /* __KERNEL__ */ #endif |