X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_wsi.c;h=5e9c239e6370648c9d27ca2baf2624b009823023;hb=e12688f365258f6f719983528a2af9b6ca4e25c5;hp=98346cae0625377b9ac22499b68969088b9b301b;hpb=2cbeb32555421ae302222e6e730b412c82742d74;p=mesa.git diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index 98346cae062..5e9c239e637 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/src/amd/vulkan/radv_wsi.c @@ -34,12 +34,30 @@ MAYBE_UNUSED static const struct wsi_callbacks wsi_cbs = { WSI_CB(GetPhysicalDeviceFormatProperties), }; +static PFN_vkVoidFunction +radv_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) +{ + return radv_lookup_entrypoint(pName); +} + +static uint32_t +radv_wsi_queue_get_family_index(VkQueue _queue) +{ + RADV_FROM_HANDLE(radv_queue, queue, _queue); + return queue->queue_family_index; +} + VkResult radv_init_wsi(struct radv_physical_device *physical_device) { VkResult result; - memset(physical_device->wsi_device.wsi, 0, sizeof(physical_device->wsi_device.wsi)); + wsi_device_init(&physical_device->wsi_device, + radv_physical_device_to_handle(physical_device), + radv_wsi_proc_addr); + + physical_device->wsi_device.queue_get_family_index = + radv_wsi_queue_get_family_index; #ifdef VK_USE_PLATFORM_XCB_KHR result = wsi_x11_init_wsi(&physical_device->wsi_device, &physical_device->instance->alloc); @@ -139,227 +157,6 @@ VkResult radv_GetPhysicalDeviceSurfacePresentModesKHR( pPresentModes); } -static VkResult -radv_wsi_image_create(VkDevice device_h, - const VkSwapchainCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks* pAllocator, - bool needs_linear_copy, - bool linear, - VkImage *image_p, - VkDeviceMemory *memory_p, - uint32_t *size, - uint32_t *offset, - uint32_t *row_pitch, int *fd_p) -{ - VkResult result = VK_SUCCESS; - struct radeon_surf *surface; - VkImage image_h; - struct radv_image *image; - int fd; - RADV_FROM_HANDLE(radv_device, device, device_h); - - result = radv_image_create(device_h, - &(struct radv_image_create_info) { - .vk_info = - &(VkImageCreateInfo) { - .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, - .imageType = VK_IMAGE_TYPE_2D, - .format = pCreateInfo->imageFormat, - .extent = { - .width = pCreateInfo->imageExtent.width, - .height = pCreateInfo->imageExtent.height, - .depth = 1 - }, - .mipLevels = 1, - .arrayLayers = 1, - .samples = 1, - /* FIXME: Need a way to use X tiling to allow scanout */ - .tiling = linear ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL, - .usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, - .flags = 0, - }, - .scanout = true}, - NULL, - &image_h); - if (result != VK_SUCCESS) - return result; - - image = radv_image_from_handle(image_h); - - VkDeviceMemory memory_h; - - const VkMemoryDedicatedAllocateInfoKHR ded_alloc = { - .sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR, - .pNext = NULL, - .buffer = VK_NULL_HANDLE, - .image = image_h - }; - - /* Find the first VRAM memory type, or GART for PRIME images. */ - int memory_type_index = -1; - for (int i = 0; i < device->physical_device->memory_properties.memoryTypeCount; ++i) { - bool is_local = !!(device->physical_device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); - if ((linear && !is_local) || (!linear && is_local)) { - memory_type_index = i; - break; - } - } - - /* fallback */ - if (memory_type_index == -1) - memory_type_index = 0; - - result = radv_alloc_memory(device_h, - &(VkMemoryAllocateInfo) { - .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, - .pNext = &ded_alloc, - .allocationSize = image->size, - .memoryTypeIndex = memory_type_index, - }, - NULL /* XXX: pAllocator */, - RADV_MEM_IMPLICIT_SYNC, - &memory_h); - if (result != VK_SUCCESS) - goto fail_create_image; - - radv_BindImageMemory(device_h, image_h, memory_h, 0); - - /* - * return the fd for the image in the no copy mode, - * or the fd for the linear image if a copy is required. - */ - if (!needs_linear_copy || (needs_linear_copy && linear)) { - RADV_FROM_HANDLE(radv_device_memory, memory, memory_h); - if (!radv_get_memory_fd(device, memory, &fd)) - goto fail_alloc_memory; - *fd_p = fd; - } - - surface = &image->surface; - - *image_p = image_h; - *memory_p = memory_h; - *size = image->size; - *offset = image->offset; - - if (device->physical_device->rad_info.chip_class >= GFX9) - *row_pitch = surface->u.gfx9.surf_pitch * surface->bpe; - else - *row_pitch = surface->u.legacy.level[0].nblk_x * surface->bpe; - return VK_SUCCESS; - fail_alloc_memory: - radv_FreeMemory(device_h, memory_h, pAllocator); - -fail_create_image: - radv_DestroyImage(device_h, image_h, pAllocator); - - return result; -} - -static void -radv_wsi_image_free(VkDevice device, - const VkAllocationCallbacks* pAllocator, - VkImage image_h, - VkDeviceMemory memory_h) -{ - radv_DestroyImage(device, image_h, pAllocator); - - radv_FreeMemory(device, memory_h, pAllocator); -} - -static const struct wsi_image_fns radv_wsi_image_fns = { - .create_wsi_image = radv_wsi_image_create, - .free_wsi_image = radv_wsi_image_free, -}; - -#define NUM_PRIME_POOLS RADV_QUEUE_TRANSFER -static void -radv_wsi_free_prime_command_buffers(struct radv_device *device, - struct wsi_swapchain *swapchain) -{ - const int num_pools = NUM_PRIME_POOLS; - const int num_images = swapchain->image_count; - int i; - for (i = 0; i < num_pools; i++) { - radv_FreeCommandBuffers(radv_device_to_handle(device), - swapchain->cmd_pools[i], - swapchain->image_count, - &swapchain->cmd_buffers[i * num_images]); - - radv_DestroyCommandPool(radv_device_to_handle(device), - swapchain->cmd_pools[i], - &swapchain->alloc); - } -} - -static VkResult -radv_wsi_create_prime_command_buffers(struct radv_device *device, - const VkAllocationCallbacks *alloc, - struct wsi_swapchain *swapchain) -{ - const int num_pools = NUM_PRIME_POOLS; - const int num_images = swapchain->image_count; - int num_cmd_buffers = num_images * num_pools; //TODO bump to MAX_QUEUE_FAMILIES - VkResult result; - int i, j; - - swapchain->cmd_buffers = vk_alloc(alloc, (sizeof(VkCommandBuffer) * num_cmd_buffers), 8, - VK_SYSTEM_ALLOCATION_SCOPE_DEVICE); - if (!swapchain->cmd_buffers) - return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); - - memset(swapchain->cmd_buffers, 0, sizeof(VkCommandBuffer) * num_cmd_buffers); - memset(swapchain->cmd_pools, 0, sizeof(VkCommandPool) * num_pools); - for (i = 0; i < num_pools; i++) { - VkCommandPoolCreateInfo pool_create_info; - - pool_create_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; - pool_create_info.pNext = NULL; - pool_create_info.flags = 0; - pool_create_info.queueFamilyIndex = i; - - result = radv_CreateCommandPool(radv_device_to_handle(device), - &pool_create_info, alloc, - &swapchain->cmd_pools[i]); - if (result != VK_SUCCESS) - goto fail; - - VkCommandBufferAllocateInfo cmd_buffer_info; - cmd_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - cmd_buffer_info.pNext = NULL; - cmd_buffer_info.commandPool = swapchain->cmd_pools[i]; - cmd_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; - cmd_buffer_info.commandBufferCount = num_images; - - result = radv_AllocateCommandBuffers(radv_device_to_handle(device), - &cmd_buffer_info, - &swapchain->cmd_buffers[i * num_images]); - if (result != VK_SUCCESS) - goto fail; - for (j = 0; j < num_images; j++) { - VkImage image, linear_image; - int idx = (i * num_images) + j; - - swapchain->get_image_and_linear(swapchain, j, &image, &linear_image); - VkCommandBufferBeginInfo begin_info = {0}; - - begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; - - radv_BeginCommandBuffer(swapchain->cmd_buffers[idx], &begin_info); - - radv_blit_to_prime_linear(radv_cmd_buffer_from_handle(swapchain->cmd_buffers[idx]), - radv_image_from_handle(image), - radv_image_from_handle(linear_image)); - - radv_EndCommandBuffer(swapchain->cmd_buffers[idx]); - } - } - return VK_SUCCESS; -fail: - radv_wsi_free_prime_command_buffers(device, swapchain); - return result; -} - VkResult radv_CreateSwapchainKHR( VkDevice _device, const VkSwapchainCreateInfoKHR* pCreateInfo, @@ -380,7 +177,7 @@ VkResult radv_CreateSwapchainKHR( &device->physical_device->wsi_device, device->physical_device->local_fd, pCreateInfo, - alloc, &radv_wsi_image_fns, + alloc, &swapchain); if (result != VK_SUCCESS) return result; @@ -393,13 +190,6 @@ VkResult radv_CreateSwapchainKHR( for (unsigned i = 0; i < ARRAY_SIZE(swapchain->fences); i++) swapchain->fences[i] = VK_NULL_HANDLE; - if (swapchain->needs_linear_copy) { - result = radv_wsi_create_prime_command_buffers(device, alloc, - swapchain); - if (result != VK_SUCCESS) - return result; - } - *pSwapchain = wsi_swapchain_to_handle(swapchain); return VK_SUCCESS; @@ -427,9 +217,6 @@ void radv_DestroySwapchainKHR( radv_DestroyFence(_device, swapchain->fences[i], pAllocator); } - if (swapchain->needs_linear_copy) - radv_wsi_free_prime_command_buffers(device, swapchain); - swapchain->destroy(swapchain, alloc); } @@ -514,11 +301,7 @@ VkResult radv_QueuePresentKHR( 1, &swapchain->fences[0]); } - if (swapchain->needs_linear_copy) { - int idx = (queue->queue_family_index * swapchain->image_count) + pPresentInfo->pImageIndices[i]; - cs = radv_cmd_buffer_from_handle(swapchain->cmd_buffers[idx])->cs; - } else - cs = queue->device->empty_cs[queue->queue_family_index]; + cs = queue->device->empty_cs[queue->queue_family_index]; RADV_FROM_HANDLE(radv_fence, fence, swapchain->fences[0]); struct radeon_winsys_fence *base_fence = fence->fence; struct radeon_winsys_ctx *ctx = queue->hw_ctx; @@ -534,6 +317,9 @@ VkResult radv_QueuePresentKHR( region = ®ions->pRegions[i]; item_result = swapchain->queue_present(swapchain, + _queue, + pPresentInfo->waitSemaphoreCount, + pPresentInfo->pWaitSemaphores, pPresentInfo->pImageIndices[i], region); /* TODO: What if one of them returns OUT_OF_DATE? */