Jason Ekstrand
a44f5ee0d8
This makes a number of changes to the current API:
1. Everything is renamed to anv_device_* instead of anv_bo_cache_*
because the BO cache is soon going to be the sole BO allocation path
and not some special case to make import/export work.
2. Drop the cache parameter. It's totally redundant with the device
and just annoying to keep typing.
3. Rework flags so that they go the convenient direction for usage in
ANV rather than whichever awkward way the i915 specified it to
maintain backwards compatibility. This also gives us the
opportunity to set some defaults.
4. Add flags for mapping and coherency.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
117 lines
4.0 KiB
C
117 lines
4.0 KiB
C
/*
|
|
* Copyright © 2015 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "anv_private.h"
|
|
|
|
VkResult anv_CreateDmaBufImageINTEL(
|
|
VkDevice _device,
|
|
const VkDmaBufImageCreateInfo* pCreateInfo,
|
|
const VkAllocationCallbacks* pAllocator,
|
|
VkDeviceMemory* pMem,
|
|
VkImage* pImage)
|
|
{
|
|
ANV_FROM_HANDLE(anv_device, device, _device);
|
|
struct anv_device_memory *mem;
|
|
struct anv_image *image;
|
|
VkResult result;
|
|
VkImage image_h;
|
|
|
|
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DMA_BUF_IMAGE_CREATE_INFO_INTEL);
|
|
|
|
mem = vk_alloc2(&device->alloc, pAllocator, sizeof(*mem), 8,
|
|
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
|
|
if (mem == NULL)
|
|
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
|
|
|
|
result = anv_image_create(_device,
|
|
&(struct anv_image_create_info) {
|
|
.isl_tiling_flags = ISL_TILING_X_BIT,
|
|
.stride = pCreateInfo->strideInBytes,
|
|
.vk_info = &(VkImageCreateInfo) {
|
|
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
|
|
.imageType = VK_IMAGE_TYPE_2D,
|
|
.format = pCreateInfo->format,
|
|
.extent = pCreateInfo->extent,
|
|
.mipLevels = 1,
|
|
.arrayLayers = 1,
|
|
.samples = 1,
|
|
/* FIXME: Need a way to use X tiling to allow scanout */
|
|
.tiling = VK_IMAGE_TILING_OPTIMAL,
|
|
.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
|
|
.flags = 0,
|
|
}
|
|
}, pAllocator, &image_h);
|
|
if (result != VK_SUCCESS)
|
|
goto fail;
|
|
|
|
image = anv_image_from_handle(image_h);
|
|
|
|
result = anv_device_import_bo(device, pCreateInfo->fd,
|
|
ANV_BO_ALLOC_IMPLICIT_SYNC,
|
|
&mem->bo);
|
|
if (result != VK_SUCCESS)
|
|
goto fail_import;
|
|
|
|
VkDeviceSize aligned_image_size = align_u64(image->size, 4096);
|
|
|
|
if (mem->bo->size < aligned_image_size) {
|
|
result = vk_errorf(device->instance, device,
|
|
VK_ERROR_INVALID_EXTERNAL_HANDLE,
|
|
"dma-buf too small for image in "
|
|
"vkCreateDmaBufImageINTEL: %"PRIu64"B < %"PRIu64"B",
|
|
mem->bo->size, aligned_image_size);
|
|
anv_device_release_bo(device, mem->bo);
|
|
goto fail_import;
|
|
}
|
|
|
|
image->planes[0].address = (struct anv_address) {
|
|
.bo = mem->bo,
|
|
.offset = 0,
|
|
};
|
|
|
|
assert(image->extent.width > 0);
|
|
assert(image->extent.height > 0);
|
|
assert(image->extent.depth == 1);
|
|
|
|
*pMem = anv_device_memory_to_handle(mem);
|
|
*pImage = anv_image_to_handle(image);
|
|
|
|
close(pCreateInfo->fd);
|
|
|
|
return VK_SUCCESS;
|
|
|
|
fail_import:
|
|
vk_free2(&device->alloc, pAllocator, image);
|
|
|
|
fail:
|
|
vk_free2(&device->alloc, pAllocator, mem);
|
|
|
|
return result;
|
|
}
|