From 96580f660e5509dcf6c34de5630e3d36b156bcd5 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Mon, 9 Jun 2008 08:54:53 -0400 Subject: [PATCH] [FreeBSD] We aren't allowed to hold locks over bus_dma_tag_create or bus_dmamem_alloc. --- bsd-core/drm_pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-core/drm_pci.c b/bsd-core/drm_pci.c index 6b411ab..f23b2a5 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) { -- 2.7.4