Module: Mesa Branch: master Commit: d7e74b52bbd41ce3699cb3f75320e0592c1d6a29 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d7e74b52bbd41ce3699cb3f75320e0592c1d6a29
Author: Marek Olšák <marek.ol...@amd.com> Date: Mon Oct 10 22:24:27 2016 +0200 winsys/amdgpu: fix infinite loop w/ RADEON_NOOP=1 caused by unsubmitted fences Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com> --- src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index c0e810c..2b86827 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -37,6 +37,8 @@ #include "amd/common/sid.h" +DEBUG_GET_ONCE_BOOL_OPTION(noop, "RADEON_NOOP", false) + /* FENCES */ static struct pipe_fence_handle * @@ -143,6 +145,9 @@ amdgpu_cs_get_next_fence(struct radeon_winsys_cs *rcs) struct amdgpu_cs *cs = amdgpu_cs(rcs); struct pipe_fence_handle *fence = NULL; + if (debug_get_option_noop()) + return NULL; + if (cs->next_fence) { amdgpu_fence_reference(&fence, cs->next_fence); return fence; @@ -1069,8 +1074,6 @@ void amdgpu_cs_sync_flush(struct radeon_winsys_cs *rcs) util_queue_job_wait(&cs->flush_completed); } -DEBUG_GET_ONCE_BOOL_OPTION(noop, "RADEON_NOOP", false) - static int amdgpu_cs_flush(struct radeon_winsys_cs *rcs, unsigned flags, struct pipe_fence_handle **fence) _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit