From 635d1b7d69b8fecc184951ba6e01bace8909a557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Wed, 3 Jan 2024 07:54:45 -0800 Subject: anv: Increase ANV_MAX_QUEUE_FAMILIES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If ANV_VIDEO_DECODE, ANV_VIDEO_DECODE and INTEL_COPY_CLASS are enabled it is possible to have 5 different queues, so here increasing ANV_MAX_QUEUE_FAMILIES. Fixes: 17b8b2cffdb0 ("anv: Add support for a transfer queue on Alchemist") Signed-off-by: José Roberto de Souza Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 0997766069b3e1cc5ecb0eb282ad2e7fa778e9fa) --- .pick_status.json | 2 +- src/intel/vulkan/anv_device.c | 2 +- src/intel/vulkan/anv_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 39ab903cc35..38bb5aac6db 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -154,7 +154,7 @@ "description": "anv: Increase ANV_MAX_QUEUE_FAMILIES", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "17b8b2cffdb07eaf06a309fabcd933886f6e7070", "notes": null diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index cf3876deb2f..4ca87819276 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -1216,7 +1216,7 @@ anv_physical_device_init_queue_families(struct anv_physical_device *pdevice) /* Increase count below when other families are added as a reminder to * increase the ANV_MAX_QUEUE_FAMILIES value. */ - STATIC_ASSERT(ANV_MAX_QUEUE_FAMILIES >= 4); + STATIC_ASSERT(ANV_MAX_QUEUE_FAMILIES >= 5); } else { /* Default to a single render queue */ pdevice->queue.families[family_count++] = (struct anv_queue_family) { diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index e0e35a5264a..fe5544addd5 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -805,7 +805,7 @@ struct anv_queue_family { enum intel_engine_class engine_class; }; -#define ANV_MAX_QUEUE_FAMILIES 4 +#define ANV_MAX_QUEUE_FAMILIES 5 struct anv_memory_type { /* Standard bits passed on to the client */ -- cgit v1.2.3