Module: Mesa Branch: staging/23.0 Commit: a9156d823b56ffd0229224daa659bd0c76ac55e5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9156d823b56ffd0229224daa659bd0c76ac55e5
Author: Paulo Zanoni <[email protected]> Date: Tue Jan 17 14:32:19 2023 -0800 hasvk: check the return value of anv_execbuf_add_bo_bitset() This is the Hasvk version of Anv's: 3d37950fd9dd ("anv: check the return value of anv_execbuf_add_bo_bitset()") Reviewed-by: Lionel Landwerlin <[email protected]> Signed-off-by: Paulo Zanoni <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20800> (cherry picked from commit 5039acfd9df6f4d3fc7cc655717b1c5389120260) --- .pick_status.json | 2 +- src/intel/vulkan_hasvk/anv_batch_chain.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index b9803561365..c996fe41730 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5665,7 +5665,7 @@ "description": "hasvk: check the return value of anv_execbuf_add_bo_bitset()", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan_hasvk/anv_batch_chain.c b/src/intel/vulkan_hasvk/anv_batch_chain.c index f4e20aacdff..4768c5204b0 100644 --- a/src/intel/vulkan_hasvk/anv_batch_chain.c +++ b/src/intel/vulkan_hasvk/anv_batch_chain.c @@ -1684,9 +1684,11 @@ setup_execbuf_for_cmd_buffer(struct anv_execbuf *execbuf, return result; } else { /* Add surface dependencies (BOs) to the execbuf */ - anv_execbuf_add_bo_bitset(cmd_buffer->device, execbuf, - cmd_buffer->surface_relocs.dep_words, - cmd_buffer->surface_relocs.deps, 0); + result = anv_execbuf_add_bo_bitset(cmd_buffer->device, execbuf, + cmd_buffer->surface_relocs.dep_words, + cmd_buffer->surface_relocs.deps, 0); + if (result != VK_SUCCESS) + return result; } /* First, we walk over all of the bos we've seen and add them and their
