fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 22:08:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Add support for not having gfx queues.

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33963>
This commit is contained in:
Bas Nieuwenhuizen 2025-02-16 01:35:00 +01:00 • committed by Marge Bot
parent 1a441ad5cb
commit d2e69dc734
1 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/amd/vulkan/radv_physical_device.c
View file

@ -103,7 +103,14 @@ radv_compute_queue_enabled(const struct radv_physical_device *pdev)
{ {
const struct radv_instance *instance = radv_physical_device_instance(pdev); const struct radv_instance *instance = radv_physical_device_instance(pdev);
return pdev->info.ip[AMD_IP_COMPUTE].num_queues > 0 && !(instance->debug_flags & RADV_DEBUG_NO_COMPUTE_QUEUE); return pdev->info.ip[AMD_IP_COMPUTE].num_queues > 0 &&
(!(instance->debug_flags & RADV_DEBUG_NO_COMPUTE_QUEUE) || !pdev->info.has_graphics);
}
static bool
radv_graphics_queue_enabled(const struct radv_physical_device *pdev)
{
return pdev->info.ip[AMD_IP_GFX].num_queues > 0;
} }
static bool static bool
@ -257,12 +264,15 @@ static void
radv_physical_device_init_queue_table(struct radv_physical_device *pdev) radv_physical_device_init_queue_table(struct radv_physical_device *pdev)
{ {
int idx = 0; int idx = 0;
pdev->vk_queue_to_radv[idx] = RADV_QUEUE_GENERAL;
idx++;
for (unsigned i = 1; i < RADV_MAX_QUEUE_FAMILIES; i++) for (unsigned i = 0; i < RADV_MAX_QUEUE_FAMILIES; i++)
pdev->vk_queue_to_radv[i] = RADV_MAX_QUEUE_FAMILIES + 1; pdev->vk_queue_to_radv[i] = RADV_MAX_QUEUE_FAMILIES + 1;
if (radv_graphics_queue_enabled(pdev)) {
pdev->vk_queue_to_radv[idx] = RADV_QUEUE_GENERAL;
idx++;
}
if (radv_compute_queue_enabled(pdev)) { if (radv_compute_queue_enabled(pdev)) {
pdev->vk_queue_to_radv[idx] = RADV_QUEUE_COMPUTE; pdev->vk_queue_to_radv[idx] = RADV_QUEUE_COMPUTE;
idx++; idx++;
@ -2433,9 +2443,12 @@ static void
radv_get_physical_device_queue_family_properties(struct radv_physical_device *pdev, uint32_t *pCount, radv_get_physical_device_queue_family_properties(struct radv_physical_device *pdev, uint32_t *pCount,
VkQueueFamilyProperties **pQueueFamilyProperties) VkQueueFamilyProperties **pQueueFamilyProperties)
{ {
int num_queue_families = 1; int num_queue_families = 0;
int idx; int idx;
if (radv_graphics_queue_enabled(pdev))
num_queue_families++;
if (radv_compute_queue_enabled(pdev)) if (radv_compute_queue_enabled(pdev))
num_queue_families++; num_queue_families++;
@ -2462,16 +2475,18 @@ radv_get_physical_device_queue_family_properties(struct radv_physical_device *pd
return; return;
idx = 0; idx = 0;
if (*pCount >= 1) { if (radv_graphics_queue_enabled(pdev)) {
VkQueueFlags gfx_flags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | if (*pCount >= 1) {
VK_QUEUE_TRANSFER_BIT | VK_QUEUE_SPARSE_BINDING_BIT; VkQueueFlags gfx_flags =
*pQueueFamilyProperties[idx] = (VkQueueFamilyProperties){ VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_SPARSE_BINDING_BIT;
.queueFlags = gfx_flags, *pQueueFamilyProperties[idx] = (VkQueueFamilyProperties){
.queueCount = 1, .queueFlags = gfx_flags,
.timestampValidBits = 64, .queueCount = 1,
.minImageTransferGranularity = (VkExtent3D){1, 1, 1}, .timestampValidBits = 64,
}; .minImageTransferGranularity = (VkExtent3D){1, 1, 1},
idx++; };
idx++;
}
} }
if (radv_compute_queue_enabled(pdev)) { if (radv_compute_queue_enabled(pdev)) {