From 464cab2e362462c974c62983249129e753f40c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Wed, 22 May 2024 15:18:50 -0700 Subject: [PATCH] anv: check cmd_buffer is on a transfer queue more properly The queueFlags of the associated queue may have more flags than just the type of queue it is, based on what that queue supports, like sparse or protected content. Check that the queue is a blitter engine instead. Fixes a bunch of dEQP-VK.api.copy_and_blit.core.*_transfer on MTL with ANV_SPARSE=0 Fixes: 17b8b2cffdb ("anv: Add support for a transfer queue on Alchemist") Reviewed-by: Sagar Ghuge Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 8d098ecfea0fca662ece82f8162ea43991a4636d) --- .pick_status.json | 2 +- src/intel/vulkan/genX_blorp_exec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index af7e423babc..bd2d3cf5c1f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1754,7 +1754,7 @@ "description": "anv: check cmd_buffer is on a transfer queue more properly", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "17b8b2cffdb07eaf06a309fabcd933886f6e7070", "notes": null diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c index 342b197c6f1..c099a8dedfe 100644 --- a/src/intel/vulkan/genX_blorp_exec.c +++ b/src/intel/vulkan/genX_blorp_exec.c @@ -429,7 +429,7 @@ blorp_exec_on_blitter(struct blorp_batch *batch, assert(batch->flags & BLORP_BATCH_USE_BLITTER); struct anv_cmd_buffer *cmd_buffer = batch->driver_batch; - assert(cmd_buffer->queue_family->queueFlags == VK_QUEUE_TRANSFER_BIT); + assert(anv_cmd_buffer_is_blitter_queue(cmd_buffer)); blorp_exec(batch, params); }