Attachment 34055 Details for Bug 27071 – Fix double unmap call when flushing from refill

[patch] Fix double unmap call when flushing from refill

0001-radeon-Fix-buffer-object-unmap-to-be-called-only-onc.patch (text/plain), 1.96 KB, created by Pauli on 2010-03-15 01:39:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pauli

Created: 2010-03-15 01:39:57 UTC

Size: 1.96 KB

patch

obsolete

>From ccc8cabfd36b807fc015becea119cd948748984d Mon Sep 17 00:00:00 2001
>From: Pauli Nieminen <suokkos@gmail.com>
>Date: Mon, 15 Mar 2010 10:30:18 +0200
>Subject: [PATCH] radeon: Fix buffer object unmap to be called only once for dma buffers.
>
>If flush happens inside radeonRefillCurrentMaRegion the last dma buffer would
>be unmapped twice. Unmapping buffer when moving buffer to wait list fixes the
>mapping error.
>
>Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
>---
> src/mesa/drivers/dri/radeon/radeon_dma.c |    7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c
>index 22499bc..6b7690c 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_dma.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_dma.c
>@@ -184,9 +184,6 @@ void radeonRefillCurrentDmaRegion(radeonContextPtr rmesa, int size)
> 	radeon_print(RADEON_DMA, RADEON_NORMAL, "%s size %d minimum_size %d\n",
> 			__FUNCTION__, size, rmesa->dma.minimum_size);
> 
>-	if (!is_empty_list(&rmesa->dma.reserved))
>-		radeon_bo_unmap(first_elem(&rmesa->dma.reserved)->bo);
>-
> 	if (is_empty_list(&rmesa->dma.free)
> 	      || last_elem(&rmesa->dma.free)->bo->size < size) {
> 		dma_bo = CALLOC_STRUCT(radeon_dma_bo);
>@@ -336,9 +333,6 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
> 		legacy_track_pending(rmesa->radeonScreen->bom, 0);
> 	}
> 
>-	if (!is_empty_list(&rmesa->dma.reserved))
>-		radeon_bo_unmap(first_elem(&rmesa->dma.reserved)->bo);
>-
> 	/* move waiting bos to free list.
> 	   wait list provides gpu time to handle data before reuse */
> 	foreach_s(dma_bo, temp, &rmesa->dma.wait) {
>@@ -368,6 +362,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
> 
> 	/* move reserved to wait list */
> 	foreach_s(dma_bo, temp, &rmesa->dma.reserved) {
>+		radeon_bo_unmap(dma_bo->bo);
> 		/* free objects that are too small to be used because of large request */
> 		if (dma_bo->bo->size < rmesa->dma.minimum_size) {
> 		   radeon_bo_unref(dma_bo->bo);
>-- 
>1.6.3.3
>

Actions: View | Splinter Review

Attachments on bug 27071: 34055

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.