diff options
| author | rnoland <rnoland@FreeBSD.org> | 2009-03-09 07:38:22 +0000 |
|---|---|---|
| committer | rnoland <rnoland@FreeBSD.org> | 2009-03-09 07:38:22 +0000 |
| commit | e227ee6ba88ecd017f3bb1833746563665d65414 (patch) | |
| tree | e10eb128741115d2175ed69f02fde200627a7e2b /sys/dev/drm/drm_scatter.c | |
| parent | d19cf7a6d0cc30cb6a31e4fd354e374306a5de40 (diff) | |
| download | FreeBSD-src-e227ee6ba88ecd017f3bb1833746563665d65414.zip FreeBSD-src-e227ee6ba88ecd017f3bb1833746563665d65414.tar.gz | |
Fix the flags to bus_dmamem_* to allow the allocation to sleep while
waiting for resources. It is really the load that we can't defer.
BUS_DMA_NOCACHE belongs on bus_dmamap_load() as well.
MFC after: 3 days
Diffstat (limited to 'sys/dev/drm/drm_scatter.c')
| -rw-r--r-- | sys/dev/drm/drm_scatter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/drm/drm_scatter.c b/sys/dev/drm/drm_scatter.c index bf0cbeb..c884df1 100644 --- a/sys/dev/drm/drm_scatter.c +++ b/sys/dev/drm/drm_scatter.c @@ -92,7 +92,7 @@ drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather *request) } ret = bus_dmamem_alloc(dmah->tag, &dmah->vaddr, - BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_NOCACHE, &dmah->map); + BUS_DMA_WAITOK | BUS_DMA_ZERO, &dmah->map); if (ret != 0) { bus_dma_tag_destroy(dmah->tag); free(dmah, DRM_MEM_DMA); @@ -102,7 +102,8 @@ drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather *request) } ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr, - request->size, drm_sg_alloc_cb, entry, 0); + request->size, drm_sg_alloc_cb, entry, + BUS_DMA_NOWAIT | BUS_DMA_NOCACHE); if (ret != 0) { bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map); bus_dma_tag_destroy(dmah->tag); |
