From 00db976905b7fcd615ccee0c13dcbf9dfe29f5ec Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Thu, 3 Oct 2019 12:26:39 +0200 Subject: [PATCH] svga: Fix banded DMA upload unmap Even with banded DMA uploads, st->hwbuf is always non-NULL, but when we've allocated a software buffer to hold the full upload, unmapping of the hardware buffer has already been done before svga_texture_transfer_unmap_dma(), and the code was performing an unmap of an already mapped buffer. Fix this by testing for software buffer not present. Fixes: a9c4a861d5d ("svga: refactor svga_texture_transfer_map/unmap functions") Signed-off-by: Thomas Hellstrom Reviewed-by: Brian Paul Reviewed-by: Charmaine Lee Reviewed-by: Roland Scheidegger --- src/gallium/drivers/svga/svga_resource_texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/svga/svga_resource_texture.c b/src/gallium/drivers/svga/svga_resource_texture.c index b04542d711a..f1d16563efb 100644 --- a/src/gallium/drivers/svga/svga_resource_texture.c +++ b/src/gallium/drivers/svga/svga_resource_texture.c @@ -758,7 +758,7 @@ svga_texture_transfer_unmap_dma(struct svga_context *svga, { struct svga_winsys_screen *sws = svga_screen(svga->pipe.screen)->sws; - if (st->hwbuf) + if (!st->swbuf) sws->buffer_unmap(sws, st->hwbuf); if (st->base.usage & PIPE_TRANSFER_WRITE) { -- 2.30.2