panvk: Expose 2 queues on v10+
This works out of the box. We could have more (up to 127) but this cause timeouts on "dEQP-VK.api.device_init.create_device_various_queue_counts.basic" and realistically we only need 2 for Android 14+ HWUI framework. Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35310>
This commit is contained in:
committed by
Marge Bot
parent
4f5ce2d5aa
commit
a6de893b60
@@ -1249,14 +1249,6 @@ fail:
|
||||
return result;
|
||||
}
|
||||
|
||||
static const VkQueueFamilyProperties panvk_queue_family_properties = {
|
||||
.queueFlags =
|
||||
VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT,
|
||||
.queueCount = 1,
|
||||
.timestampValidBits = 0,
|
||||
.minImageTransferGranularity = {1, 1, 1},
|
||||
};
|
||||
|
||||
static void
|
||||
panvk_fill_global_priority(const struct panvk_physical_device *physical_device,
|
||||
VkQueueFamilyGlobalPriorityPropertiesKHR *prio)
|
||||
@@ -1288,10 +1280,19 @@ panvk_GetPhysicalDeviceQueueFamilyProperties2(
|
||||
VK_FROM_HANDLE(panvk_physical_device, physical_device, physicalDevice);
|
||||
VK_OUTARRAY_MAKE_TYPED(VkQueueFamilyProperties2, out, pQueueFamilyProperties,
|
||||
pQueueFamilyPropertyCount);
|
||||
unsigned arch = pan_arch(physical_device->kmod.props.gpu_prod_id);
|
||||
|
||||
vk_outarray_append_typed(VkQueueFamilyProperties2, &out, p)
|
||||
{
|
||||
p->queueFamilyProperties = panvk_queue_family_properties;
|
||||
p->queueFamilyProperties = (VkQueueFamilyProperties){
|
||||
.queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT |
|
||||
VK_QUEUE_TRANSFER_BIT,
|
||||
/* On v10+ we can support up to 127 queues but this causes timeout on
|
||||
some CTS tests */
|
||||
.queueCount = arch >= 10 ? 2 : 1,
|
||||
.timestampValidBits = 0,
|
||||
.minImageTransferGranularity = (VkExtent3D){1, 1, 1},
|
||||
};
|
||||
|
||||
VkQueueFamilyGlobalPriorityPropertiesKHR *prio =
|
||||
vk_find_struct(p->pNext, QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR);
|
||||
|
||||
Reference in New Issue
Block a user