diff options
author | Dave Airlie <airlied@linux.ie> | 2006-03-19 18:56:12 +1100 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-03-19 18:56:12 +1100 |
commit | ddf19b973be5a96d77c8467f657fe5bd7d126e0f (patch) | |
tree | e7b003b3dad82014b364acde5681956011e67b58 /drivers/char/drm/drmP.h | |
parent | 60a6dc55b93b3321afa52f650a149fb7e87fa85a (diff) | |
download | linux-ddf19b973be5a96d77c8467f657fe5bd7d126e0f.tar.gz linux-ddf19b973be5a96d77c8467f657fe5bd7d126e0f.tar.bz2 linux-ddf19b973be5a96d77c8467f657fe5bd7d126e0f.zip |
drm: fixup PCI DMA support
This patch makes the PCI support use the correct Linux interfaces finally.
Tested in DRM CVS on PCI MGA card.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r-- | drivers/char/drm/drmP.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 107df9fdba4e..dbe952f899c0 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -357,6 +357,12 @@ typedef struct drm_freelist { spinlock_t lock; } drm_freelist_t; +typedef struct drm_dma_handle { + dma_addr_t busaddr; + void *vaddr; + size_t size; +} drm_dma_handle_t; + /** * Buffer entry. There is one of this for each buffer size order. */ @@ -366,7 +372,7 @@ typedef struct drm_buf_entry { drm_buf_t *buflist; /**< buffer list */ int seg_count; int page_order; - unsigned long *seglist; + drm_dma_handle_t **seglist; drm_freelist_t freelist; } drm_buf_entry_t; @@ -483,12 +489,6 @@ typedef struct drm_sigdata { drm_hw_lock_t *lock; } drm_sigdata_t; -typedef struct drm_dma_handle { - dma_addr_t busaddr; - void *vaddr; - size_t size; -} drm_dma_handle_t; - /** * Mappings list */ |