diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-11-06 01:41:47 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-11-06 01:41:47 +0000 |
| commit | c9202c89653b8dac2ac322c3d3a7389945e1c94c (patch) | |
| tree | da57c01384977ea6a2962cfaac9c7c426da2c0f8 /shared-core/i915_dma.c | |
| parent | 39a23640b2de9e59e99d48e6de8c9edae0231856 (diff) | |
Commit WIP of BSD conversion to core model. Compiles for r128, radeon, but
doesn't run yet. Moves the ioctl definitions for these two drivers back
to the shared code -- they aren't OS-specific.
Diffstat (limited to 'shared-core/i915_dma.c')
| -rw-r--r-- | shared-core/i915_dma.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 9007bd2c..1c524968 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -96,8 +96,7 @@ int i915_dma_cleanup(drm_device_t * dev) if (dev_priv->hw_status_page) { #ifdef __FreeBSD__ #if __FreeBSD_version > 500000 - contigfree(dev_priv->hw_status_page, PAGE_SIZE, - drm_M_DRM); + contigfree(dev_priv->hw_status_page, PAGE_SIZE, M_DRM); #endif #else pci_free_consistent(dev->pdev, PAGE_SIZE, @@ -182,7 +181,7 @@ static int i915_initialize(drm_device_t * dev, /* Program Hardware Status Page */ #ifdef __FreeBSD__ dev_priv->hw_status_page = - contigmalloc(PAGE_SIZE, drm_M_DRM, M_NOWAIT, 0ul, 0, 0, 0); + contigmalloc(PAGE_SIZE, M_DRM, M_NOWAIT, 0ul, 0, 0, 0); dev_priv->dma_status_page = vtophys(dev_priv->hw_status_page); #else dev_priv->hw_status_page = |