diff options
| author | Robert Noland <rnoland@wombat.2hip.net> | 2008-06-09 08:54:53 -0400 |
|---|---|---|
| committer | Robert Noland <rnoland@2hip.net> | 2008-07-15 16:53:54 -0400 |
| commit | 96580f660e5509dcf6c34de5630e3d36b156bcd5 (patch) | |
| tree | 1b45100491bdf7309fec5ee404f0e9835dc036f1 | |
| parent | dfd441cf964f20e4a761cb8490d7cd82cf32e7b9 (diff) | |
[FreeBSD] We aren't allowed to hold locks over bus_dma_tag_create or bus_dmamem_alloc.
| -rw-r--r-- | bsd-core/drm_pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bsd-core/drm_pci.c b/bsd-core/drm_pci.c index 6b411abb..f23b2a5b 100644 --- a/bsd-core/drm_pci.c +++ b/bsd-core/drm_pci.c @@ -71,6 +71,7 @@ drm_pci_alloc(struct drm_device *dev, size_t size, return NULL; #ifdef __FreeBSD__ + DRM_UNLOCK(); ret = bus_dma_tag_create(NULL, align, 0, /* tag, align, boundary */ maxaddr, BUS_SPACE_MAXADDR, /* lowaddr, highaddr */ NULL, NULL, /* filtfunc, filtfuncargs */ @@ -79,6 +80,7 @@ drm_pci_alloc(struct drm_device *dev, size_t size, &dmah->tag); if (ret != 0) { free(dmah, M_DRM); + DRM_LOCK(); return NULL; } @@ -87,9 +89,10 @@ drm_pci_alloc(struct drm_device *dev, size_t size, if (ret != 0) { bus_dma_tag_destroy(dmah->tag); free(dmah, M_DRM); + DRM_LOCK(); return NULL; } - + DRM_LOCK(); ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr, size, drm_pci_busdma_callback, dmah, 0); if (ret != 0) { |