Mesa (master): radeonsi: fix a crash in si_fence_server_sync

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Dec 9 20:12:24 UTC 2020


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Dec  9 14:41:13 2020 -0500

radeonsi: fix a crash in si_fence_server_sync

Fixes: 1f31a216640 - radeonsi: remove SDMA support

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8010>

---

 src/gallium/drivers/radeonsi/si_fence.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_fence.c b/src/gallium/drivers/radeonsi/si_fence.c
index a2d0d1862a5..ab48a71729e 100644
--- a/src/gallium/drivers/radeonsi/si_fence.c
+++ b/src/gallium/drivers/radeonsi/si_fence.c
@@ -572,7 +572,8 @@ static void si_fence_server_sync(struct pipe_context *ctx, struct pipe_fence_han
     * the time it takes to create and submit that IB, flushing decreases
     * performance. Therefore, DO NOT FLUSH.
     */
-   si_add_fence_dependency(sctx, sfence->gfx);
+   if (sfence->gfx)
+      si_add_fence_dependency(sctx, sfence->gfx);
 }
 
 void si_init_fence_functions(struct si_context *ctx)



More information about the mesa-commit mailing list