diff options
| author | José Roberto de Souza <jose.souza@intel.com> | 2024-01-03 07:54:45 -0800 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2024-01-10 10:10:18 +0000 |
| commit | 635d1b7d69b8fecc184951ba6e01bace8909a557 (patch) | |
| tree | c371b5af75bb9e6e31f6d0278147d2a094414b67 | |
| parent | 08f688d23619b3f0ab8d70932db87cfe4ab42e4f (diff) | |
| download | mesa-635d1b7d69b8fecc184951ba6e01bace8909a557.tar.gz mesa-635d1b7d69b8fecc184951ba6e01bace8909a557.tar.bz2 mesa-635d1b7d69b8fecc184951ba6e01bace8909a557.zip | |
anv: Increase ANV_MAX_QUEUE_FAMILIES
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 <jose.souza@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26882>
(cherry picked from commit 0997766069b3e1cc5ecb0eb282ad2e7fa778e9fa)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_device.c | 2 | ||||
| -rw-r--r-- | 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 */ |