diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-12 14:25:29 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-12 14:25:29 +1000 |
commit | 5c6a23704afa9445a58585ea2b8686b054f4074a (patch) | |
tree | 7663e3a7ec51fdfa0d68dd87606d0427760d9bf2 /linux-core | |
parent | abf35cbdcf5743c73929ddbe67ed4cae69b32aeb (diff) |
Merge branch 'radeon-ttm' of git://people.freedesktop.org/~airlied/drm into radeon-ttm
Conflicts:
linux-core/ati_pcigart.c
linux-core/drmP.h
linux-core/radeon_buffer.c
Diffstat (limited to 'linux-core')
-rw-r--r-- | linux-core/drmP.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 5eb7c037..4b54c244 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -1161,6 +1161,7 @@ extern int drm_sg_free(struct inode *inode, struct file *filp, /* ATI PCIGART support (ati_pcigart.h) */ extern int drm_ati_pcigart_init(drm_device_t * dev, drm_ati_pcigart_info *gart_info); extern int drm_ati_pcigart_cleanup(drm_device_t * dev, drm_ati_pcigart_info *gart_info); +extern drm_ttm_backend_t *ati_pcigart_init_ttm(struct drm_device *dev, struct ati_pcigart_info *info, void (*gart_flush_fn)(struct drm_device *dev)); extern drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align, dma_addr_t maxaddr); |