diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-10 01:38:56 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-07-10 01:38:56 -0400 |
commit | 9c8da5ebbf6f87293cf8555182da271449889a69 (patch) | |
tree | c036835be2ec09249f960518ff2703316257d815 /drivers/char/drm/drmP.h | |
parent | d59431bf96d1e8a3d6d240343f559f5e2ace7f1d (diff) |
drm: update support for drm pci buffers
The DRM needs to change the drm_pci interface for FreeBSD compatiblity,
this patch introduces the drm_dma_handle_t and uses it in the Linux code.
From: Tonnerre Lombard, Eric Anholt, and Sergey Vlasov
Signed-off-by: David Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r-- | drivers/char/drm/drmP.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 804e622436a..7e633a9ce93 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -527,6 +527,12 @@ typedef struct drm_sigdata { | |||
527 | drm_hw_lock_t *lock; | 527 | drm_hw_lock_t *lock; |
528 | } drm_sigdata_t; | 528 | } drm_sigdata_t; |
529 | 529 | ||
530 | typedef struct drm_dma_handle { | ||
531 | dma_addr_t busaddr; | ||
532 | void *vaddr; | ||
533 | size_t size; | ||
534 | } drm_dma_handle_t; | ||
535 | |||
530 | /** | 536 | /** |
531 | * Mappings list | 537 | * Mappings list |
532 | */ | 538 | */ |
@@ -978,12 +984,10 @@ extern int drm_ati_pcigart_cleanup(drm_device_t *dev, | |||
978 | unsigned long addr, | 984 | unsigned long addr, |
979 | dma_addr_t bus_addr); | 985 | dma_addr_t bus_addr); |
980 | 986 | ||
981 | extern void *drm_pci_alloc(drm_device_t * dev, size_t size, | 987 | extern drm_dma_handle_t *drm_pci_alloc(drm_device_t *dev, size_t size, |
982 | size_t align, dma_addr_t maxaddr, | 988 | size_t align, dma_addr_t maxaddr); |
983 | dma_addr_t * busaddr); | 989 | extern void __drm_pci_free(drm_device_t *dev, drm_dma_handle_t *dmah); |
984 | 990 | extern void drm_pci_free(drm_device_t *dev, drm_dma_handle_t *dmah); | |
985 | extern void drm_pci_free(drm_device_t * dev, size_t size, | ||
986 | void *vaddr, dma_addr_t busaddr); | ||
987 | 991 | ||
988 | /* sysfs support (drm_sysfs.c) */ | 992 | /* sysfs support (drm_sysfs.c) */ |
989 | struct drm_sysfs_class; | 993 | struct drm_sysfs_class; |