From 9aba81b1609c6f7b61125ca915291c83a511d5bd Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 28 Mar 2017 17:33:06 -0700 Subject: [PATCH] anv/batch_chain: Handle another OOM in cmd_buffer_execbuf Found by inspection while rebasing other patches. Reviewed-by: Topi Pohjolainen --- src/intel/vulkan/anv_batch_chain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index 5d7abc68b32..5a6c0ba1a96 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -1277,8 +1277,10 @@ anv_cmd_buffer_execbuf(struct anv_device *device, adjust_relocations_to_state_pool(ss_pool, &(*bbo)->bo, &(*bbo)->relocs, cmd_buffer->last_ss_pool_center); - anv_execbuf_add_bo(&execbuf, &(*bbo)->bo, &(*bbo)->relocs, - &cmd_buffer->pool->alloc); + result = anv_execbuf_add_bo(&execbuf, &(*bbo)->bo, &(*bbo)->relocs, + &cmd_buffer->pool->alloc); + if (result != VK_SUCCESS) + return result; } /* Now that we've adjusted all of the surface state relocations, we need to -- 2.30.2