30c30
< __FBSDID("$FreeBSD: head/sys/dev/drm/i915_dma.c 182080 2008-08-23 20:59:12Z rnoland $");
---
> __FBSDID("$FreeBSD: head/sys/dev/drm/i915_dma.c 182883 2008-09-09 02:05:03Z rnoland $");
253,256c253,261
< dev_priv->status_page_dmah =
< drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
<
< if (!dev_priv->status_page_dmah) {
---
> drm_dma_handle_t *dmah;
> #ifdef __FreeBSD__
> DRM_UNLOCK();
> #endif
> dmah = drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
> #ifdef __FreeBSD__
> DRM_LOCK();
> #endif
> if (!dmah) {
261,262c266,268
< dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
< dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
---
> dev_priv->status_page_dmah = dmah;
> dev_priv->hw_status_page = dmah->vaddr;
> dev_priv->dma_status_page = dmah->busaddr;