diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-04-26 05:19:11 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-04-26 05:19:11 +0000 |
| commit | ec111d70fee0647c4c68a02c723d4a3729c93b56 (patch) | |
| tree | 114a3257310a979d3dea484af62322ba007bf1e0 /shared-core/i915_drv.h | |
| parent | 31a06d0baca9e378a773ca8bd350860546dd8a79 (diff) | |
Convert BSD code to mostly use bus_dma, the dma abstraction for dealing
with IOMMUs and such. There is one usage of the forbidden vtophys()
left in drm_scatter.c which will be fixed up soon. This required a KPI
change for drm_pci_alloc/free() to return/use a drm_dma_handle_t that
keeps track of os-specific bits, rather than just passing around the
vaddr/busaddr/size.
Submitted by: Tonnerre Lombard (partially) Tested on: FreeBSD: Rage128
AGP/PCI Linux: Savage4 AGP/PCI
Diffstat (limited to 'shared-core/i915_drv.h')
| -rw-r--r-- | shared-core/i915_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index a4294159..b9615341 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -55,9 +55,10 @@ typedef struct drm_i915_private { drm_i915_sarea_t *sarea_priv; drm_i915_ring_buffer_t ring; + drm_dma_handle_t *status_page_dmah; void *hw_status_page; - unsigned long counter; dma_addr_t dma_status_page; + unsigned long counter; int back_offset; int front_offset; |