From 771f7c1d91f1cb2cb781458a2cccc2b43b89de50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Mon, 13 Feb 2023 10:09:35 +0100 Subject: [PATCH] anv: bump ANV_MAX_QUEUE_FAMILIES Now it's possible to overflow anv_physical_device.queue.families and anv_device.decoder. CID: 1520852 Fixes: 056b0cb87f2 ("anv: add video engine support in various places") Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_device.c | 2 +- src/intel/vulkan/anv_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index d9a30052778..170a0b8b76d 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -769,7 +769,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 >= 3); + STATIC_ASSERT(ANV_MAX_QUEUE_FAMILIES >= 4); } 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 ca90c57908e..7a3214075e5 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -874,7 +874,7 @@ struct anv_queue_family { enum intel_engine_class engine_class; }; -#define ANV_MAX_QUEUE_FAMILIES 3 +#define ANV_MAX_QUEUE_FAMILIES 4 struct anv_memory_type { /* Standard bits passed on to the client */