From 4ca646f2773c277150d674b104b81df8b360b699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Sat, 8 Apr 2023 14:28:50 +0200 Subject: [PATCH] radv/amdgpu: Fix mismatching return type of radv_amdgpu_cs_submit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a warning that is reported by GCC 13. Cc: mesa-stable Signed-off-by: Timur Kristóf Reviewed-by: Bas Nieuwenhuizen Part-of: (cherry picked from commit a7080fe4ef9a933b179f322d4c50a36116a7fbc7) --- .pick_status.json | 2 +- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f6ed4841150..5f01382a648 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4534,7 +4534,7 @@ "description": "radv/amdgpu: Fix mismatching return type of radv_amdgpu_cs_submit.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 14e9a11a9f5..249cd3e075d 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -161,9 +161,9 @@ struct radv_amdgpu_cs_request { uint64_t seq_no; }; -static int radv_amdgpu_cs_submit(struct radv_amdgpu_ctx *ctx, - struct radv_amdgpu_cs_request *request, - struct radv_winsys_sem_info *sem_info); +static VkResult radv_amdgpu_cs_submit(struct radv_amdgpu_ctx *ctx, + struct radv_amdgpu_cs_request *request, + struct radv_winsys_sem_info *sem_info); static void radv_amdgpu_request_to_fence(struct radv_amdgpu_ctx *ctx, struct radv_amdgpu_fence *fence,