diff options
| author | Robert Noland <rnoland@2hip.net> | 2008-09-06 18:37:06 -0400 |
|---|---|---|
| committer | Robert Noland <rnoland@2hip.net> | 2008-09-06 18:37:06 -0400 |
| commit | 6f2479c67432f764bfc4e248689f1737c1935237 (patch) | |
| tree | d78b9dc1913cda30088176b534d8295334e25b25 /shared-core | |
| parent | 31709aa2be54877c45ca382bf370b41dbaf5c2ec (diff) | |
[FreeBSD] Ensure that drm_pci_alloc is never called while locks are held.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/i915_dma.c | 20 | ||||
| -rw-r--r-- | shared-core/mach64_dma.c | 6 |
2 files changed, 20 insertions, 6 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index c874ce28..619e6ac2 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -72,16 +72,24 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller) int i915_init_hardware_status(struct drm_device *dev) { drm_i915_private_t *dev_priv = dev->dev_private; - /* Program Hardware Status Page */ - dev_priv->status_page_dmah = - drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff); + drm_dma_handle_t *dmah; - if (!dev_priv->status_page_dmah) { + /* Program Hardware Status Page */ +#ifdef __FreeBSD__ + DRM_UNLOCK(); +#endif + dmah = drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff); +#ifdef __FreeBSD__ + DRM_LOCK(); +#endif + if (!dmah) { DRM_ERROR("Can not allocate hardware status page\n"); return -ENOMEM; } - 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; memset(dev_priv->hw_status_page, 0, PAGE_SIZE); diff --git a/shared-core/mach64_dma.c b/shared-core/mach64_dma.c index 339234fa..3f2367ba 100644 --- a/shared-core/mach64_dma.c +++ b/shared-core/mach64_dma.c @@ -834,8 +834,14 @@ static int mach64_bm_dma_test(struct drm_device * dev) /* FIXME: get a dma buffer from the freelist here */ DRM_DEBUG("Allocating data memory ...\n"); +#ifdef __FreeBSD__ + DRM_UNLOCK(); +#endif cpu_addr_dmah = drm_pci_alloc(dev, 0x1000, 0x1000, 0xfffffffful); +#ifdef __FreeBSD__ + DRM_LOCK(); +#endif if (!cpu_addr_dmah) { DRM_INFO("data-memory allocation failed!\n"); return -ENOMEM; |