diff options
author | Dave Airlie <airlied@redhat.com> | 2009-06-29 20:15:47 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-06-29 20:15:47 +1000 |
commit | 6791576f6cc90018bd65c263fa6c16ad2b19cdae (patch) | |
tree | e6b2ef8637ee5c64a43a482ca714cf6dce3a30ab /src/mesa/drivers/dri/radeon/radeon_dma.c | |
parent | 928a5684177fdb6cd013949348aee6078dd305c0 (diff) |
Revert "r200: make use of DMA buffers for Elts a lot better."
This reverts commit 0952645fe04a27968565ea4d913500c23b1b11e3.
Need to revisit where this is going wrong
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_dma.c')
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_dma.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 0b91434b2b..48b0d63818 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/src/mesa/drivers/dri/radeon/radeon_dma.c @@ -167,7 +167,7 @@ void radeonRefillCurrentDmaRegion(radeonContextPtr rmesa, int size) size = MAX2(size, MAX_DMA_BUF_SZ); if (RADEON_DEBUG & (DEBUG_IOCTL | DEBUG_DMA)) - fprintf(stderr, "%s %d\n", __FUNCTION__, rmesa->dma.nr_released_bufs); + fprintf(stderr, "%s\n", __FUNCTION__); if (rmesa->dma.flush) { rmesa->dma.flush(rmesa->glCtx); @@ -178,7 +178,11 @@ void radeonRefillCurrentDmaRegion(radeonContextPtr rmesa, int size) rmesa->dma.nr_released_bufs = 0; } - radeonReleaseDmaRegion(rmesa); + if (rmesa->dma.current) { + radeon_bo_unmap(rmesa->dma.current); + radeon_bo_unref(rmesa->dma.current); + rmesa->dma.current = 0; + } again_alloc: rmesa->dma.current = radeon_bo_open(rmesa->radeonScreen->bom, @@ -240,17 +244,6 @@ void radeonAllocDmaRegion(radeonContextPtr rmesa, assert(rmesa->dma.current_used <= rmesa->dma.current->size); } -void radeonReturnDmaRegion(radeonContextPtr rmesa, int return_bytes) -{ - if (!rmesa->dma.current) - return; - - if (RADEON_DEBUG & DEBUG_IOCTL) - fprintf(stderr, "%s %d\n", __FUNCTION__, return_bytes); - rmesa->dma.current_used -= return_bytes; - rmesa->dma.current_vertexptr = rmesa->dma.current_used; -} - void radeonReleaseDmaRegion(radeonContextPtr rmesa) { if (RADEON_DEBUG & DEBUG_IOCTL) |