Mesa (master): radv/winsys: do not assign last submission when chained path failed

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Oct 30 11:41:20 2018 +0100

radv/winsys: do not assign last submission when chained path failed

I don't think we want to wait for something that hasn't been
correctly submitted. This is similar to the fallback path.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index 75f1c47fd9..abc4f3903d 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -840,12 +840,15 @@ static int radv_amdgpu_winsys_cs_submit_chained(struct radeon_winsys_ctx *_ctx,
 	if (bo_list)
 		amdgpu_bo_list_destroy(bo_list);
 
+	if (r)
+		return r;
+
 	if (fence)
 		radv_amdgpu_request_to_fence(ctx, fence, &request);
 
 	radv_assign_last_submit(ctx, &request);
 
-	return r;
+	return 0;
 }
 
 static int radv_amdgpu_winsys_cs_submit_fallback(struct radeon_winsys_ctx *_ctx,