Mesa (master): r600g: Fix segfault in r600_compute_global_transfer_map()

Tom Stellard tstellar at kemper.freedesktop.org
Tue Oct 16 14:40:37 UTC 2012


Module: Mesa
Branch: master
Commit: b1e7bd769081a5ebe87b6a5caba4265b0b5bfe0c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1e7bd769081a5ebe87b6a5caba4265b0b5bfe0c

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Tue Oct 16 14:21:40 2012 +0000

r600g: Fix segfault in r600_compute_global_transfer_map()

This segfault was caused by commit
369e46888904c6d379b8b477d9242cff1608e30e, however it is my fault for not
testing the patch while it was on the list.

---

 src/gallium/drivers/r600/evergreen_compute.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 655cf75..5571594 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -851,7 +851,7 @@ void *r600_compute_global_transfer_map(
 	struct compute_memory_pool *pool = rctx->screen->global_pool;
 	struct pipe_transfer *transfer = util_slab_alloc(&rctx->pool_transfers);
 	struct r600_resource_global* buffer =
-		(struct r600_resource_global*)transfer->resource;
+		(struct r600_resource_global*)resource;
 	uint32_t* map;
 
 	compute_memory_finalize_pending(pool, ctx_);




More information about the mesa-commit mailing list