From 428f2bea18c19dbee4cdcc95e929ec7726afcb71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Tue, 19 Nov 2024 20:21:26 +0200 Subject: [PATCH] anv/android: always create 2 graphics and compute capable queues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android hwui requires 2 queues. Cc: mesa-stable Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 19b6991160f6d371f6710a9d0e4f36856b114e2f) --- .pick_status.json | 2 +- src/intel/vulkan/anv_physical_device.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 6d0a9e13784..0b00c4471fd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -644,7 +644,7 @@ "description": "anv/android: always create 2 graphics and compute capable queues", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/vulkan/anv_physical_device.c b/src/intel/vulkan/anv_physical_device.c index efa8eba2883..093db4aae72 100644 --- a/src/intel/vulkan/anv_physical_device.c +++ b/src/intel/vulkan/anv_physical_device.c @@ -2202,6 +2202,11 @@ anv_override_engine_counts(int *gc_count, int *g_count, int *c_count, int *v_cou int blit_override = -1; const char *env_ = os_get_option("ANV_QUEUE_OVERRIDE"); + /* Override queues for Android HWUI that expects min 2 queues. */ +#if DETECT_OS_ANDROID + *gc_count = 2; +#endif + if (env_ == NULL) return;