diff options
| author | rnoland <rnoland@FreeBSD.org> | 2008-09-09 02:05:03 +0000 |
|---|---|---|
| committer | rnoland <rnoland@FreeBSD.org> | 2008-09-09 02:05:03 +0000 |
| commit | 016be156e0964094bf2d383d94aef409a35dc78c (patch) | |
| tree | b049bd3bd13dc9dbf8c993171dae2fd568b69bed /sys/dev/drm/drm_bufs.c | |
| parent | 1af31f868a04970e4e460e2e08c563289e42b042 (diff) | |
| download | FreeBSD-src-016be156e0964094bf2d383d94aef409a35dc78c.zip FreeBSD-src-016be156e0964094bf2d383d94aef409a35dc78c.tar.gz | |
We should never call drm_pci_alloc() while holding locks, due the the
calls to bus_dma. There were multiple paths that held different locks or
no locks at all. This patch ensures that all of the calling paths drop
their lock(s) before calling drm_pci_alloc().
Reviewed by: kib
Diffstat (limited to 'sys/dev/drm/drm_bufs.c')
| -rw-r--r-- | sys/dev/drm/drm_bufs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/drm/drm_bufs.c b/sys/dev/drm/drm_bufs.c index 9ad13d7..b07359c 100644 --- a/sys/dev/drm/drm_bufs.c +++ b/sys/dev/drm/drm_bufs.c @@ -598,8 +598,10 @@ static int drm_do_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request) page_count = 0; while ( entry->buf_count < count ) { + DRM_SPINUNLOCK(&dev->dma_lock); drm_dma_handle_t *dmah = drm_pci_alloc(dev, size, alignment, 0xfffffffful); + DRM_SPINLOCK(&dev->dma_lock); if (dmah == NULL) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; |
