From 7d5c727f57f430d59c4d598a3d4294a2438854aa Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Wed, 2 Nov 2022 08:53:12 +0100 Subject: [PATCH] v3dv: handle allocation failure during pipeline initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes (with disk cache disabled): dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic dEQP-VK.api.object_management.alloc_callback_fail.device dEQP-VK.api.object_management.alloc_callback_fail.device_group Reviewed-by: Alejandro Piñeiro Reviewed-by: Eric Engestrom cc: mesa-stable Part-of: (cherry picked from commit 1f5966397aa208eb574394a4d0a592b66b776b44) --- .pick_status.json | 2 +- src/broadcom/vulkan/v3dv_pipeline.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 3638692f8d9..4cb11580aa8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1930,7 +1930,7 @@ "description": "v3dv: handle allocation failure during pipeline initialization", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index f2cf9d5bd4e..f466c084a43 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -2501,6 +2501,8 @@ pipeline_compile_graphics(struct v3dv_pipeline *pipeline, */ pipeline->shared_data = v3dv_pipeline_shared_data_new_empty(pipeline->sha1, pipeline, true); + if (!pipeline->shared_data) + return VK_ERROR_OUT_OF_HOST_MEMORY; pipeline->vs->feedback.flags |= VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT; @@ -3203,6 +3205,8 @@ pipeline_compile_compute(struct v3dv_pipeline *pipeline, pipeline->shared_data = v3dv_pipeline_shared_data_new_empty(pipeline->sha1, pipeline, false); + if (!pipeline->shared_data) + return VK_ERROR_OUT_OF_HOST_MEMORY; p_stage->feedback.flags |= VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT;