mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

turnip/android: Migrate to common ANB code 

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Tested-by: tarsin <yuanqingxiang233@163.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29090>
This commit is contained in:
Roman Stratiienko 2023-09-23 15:55:59 +03:00 committed by Marge Bot
parent e047d75a57
commit 1373b0966c
6 changed files with 44 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

377
src/freedreno/vulkan/tu_android.cc
View File

@ -5,22 +5,13 @@
#include "tu_android.h"
#include <hardware/gralloc.h>
#if ANDROID_API_LEVEL >= 26
#include <hardware/gralloc1.h>
#endif
#include <hardware/hardware.h>
#include <hardware/hwvulkan.h>
#include "drm-uapi/drm_fourcc.h"
#include "util/libsync.h"
#include "util/os_file.h"
#include "util/u_gralloc/u_gralloc.h"
#include "vk_android.h"
#include "tu_device.h"
#include "tu_image.h"
static int
tu_hal_open(const struct hw_module_t *mod,
@ -48,15 +39,6 @@ PUBLIC struct hwvulkan_module_t HAL_MODULE_INFO_SYM = {
},
};
/* If any bits in test_mask are set, then unset them and return true. */
static inline bool
unmask32(uint32_t *inout_mask, uint32_t test_mask)
{
uint32_t orig_mask = *inout_mask;
*inout_mask &= ~test_mask;
return *inout_mask != orig_mask;
}
static int
tu_hal_open(const struct hw_module_t *mod,
const char *id,
@ -83,6 +65,8 @@ tu_hal_open(const struct hw_module_t *mod,
.GetInstanceProcAddr = tu_GetInstanceProcAddr,
};
vk_android_init_ugralloc();
*dev = &hal_dev->common;
return 0;
}
@ -91,358 +75,7 @@ static int
tu_hal_close(struct hw_device_t *dev)
{
/* hwvulkan.h claims that hw_device_t::close() is never called. */
vk_android_destroy_ugralloc();
return -1;
}
/* get dma-buf and modifier from gralloc info */
static VkResult
tu_gralloc_info_other(struct tu_device *device,
const VkNativeBufferANDROID *gralloc_info,
int *dma_buf,
uint64_t *modifier)
{
const uint32_t *handle_fds = (uint32_t *)gralloc_info->handle->data;
const uint32_t *handle_data = &handle_fds[gralloc_info->handle->numFds];
bool ubwc = false;
if (gralloc_info->handle->numFds == 1) {
/* gbm_gralloc. TODO: modifiers support */
*dma_buf = handle_fds[0];
} else if (gralloc_info->handle->numFds == 2) {
/* Qualcomm gralloc, find it at:
*
* https://android.googlesource.com/platform/hardware/qcom/display/.
*
* The gralloc_info->handle is a pointer to a struct private_handle_t
* from your platform's gralloc. On msm8996 (a5xx) and newer grallocs
* that's libgralloc1/gr_priv_handle.h, while previously it was
* libgralloc/gralloc_priv.h.
*/
if (gralloc_info->handle->numInts < 2) {
return vk_errorf(device, VK_ERROR_INVALID_EXTERNAL_HANDLE,
"VkNativeBufferANDROID::handle::numInts is %d, "
"expected at least 2 for qcom gralloc",
gralloc_info->handle->numFds);
}
uint32_t gmsm = ('g' << 24) | ('m' << 16) | ('s' << 8) | 'm';
if (handle_data[0] != gmsm) {
return vk_errorf(device, VK_ERROR_INVALID_EXTERNAL_HANDLE,
"private_handle_t::magic is %x, expected %x",
handle_data[0], gmsm);
}
/* This UBWC flag was introduced in a5xx. */
ubwc = handle_data[1] & 0x08000000;
/* QCOM gralloc has two fds passed in: the actual GPU buffer, and a buffer
* of CPU-side metadata. I haven't found any need for the metadata buffer
* yet. See qdMetaData.h for what's in the metadata fd.
*/
*dma_buf = handle_fds[0];
} else {
return vk_errorf(device, VK_ERROR_INVALID_EXTERNAL_HANDLE,
"VkNativeBufferANDROID::handle::numFds is %d, "
"expected 1 (gbm_gralloc) or 2 (qcom gralloc)",
gralloc_info->handle->numFds);
}
*modifier = ubwc ? DRM_FORMAT_MOD_QCOM_COMPRESSED : DRM_FORMAT_MOD_LINEAR;
return VK_SUCCESS;
}
static const char cros_gralloc_module_name[] = "CrOS Gralloc";
#define CROS_GRALLOC_DRM_GET_BUFFER_INFO 4
#define CROS_GRALLOC_DRM_GET_USAGE 5
#define CROS_GRALLOC_DRM_GET_USAGE_FRONT_RENDERING_BIT 0x1
struct cros_gralloc0_buffer_info {
uint32_t drm_fourcc;
int num_fds;
int fds[4];
uint64_t modifier;
int offset[4];
int stride[4];
};
static VkResult
tu_gralloc_info_cros(struct tu_device *device,
const VkNativeBufferANDROID *gralloc_info,
int *dma_buf,
uint64_t *modifier)
{
const gralloc_module_t *gralloc = (const gralloc_module_t *) device->gralloc;
struct cros_gralloc0_buffer_info info;
int ret;
ret = gralloc->perform(gralloc, CROS_GRALLOC_DRM_GET_BUFFER_INFO,
gralloc_info->handle, &info);
if (ret)
return VK_ERROR_INVALID_EXTERNAL_HANDLE;
*dma_buf = info.fds[0];
*modifier = info.modifier;
return VK_SUCCESS;
}
VkResult
tu_gralloc_info(struct tu_device *device,
const VkNativeBufferANDROID *gralloc_info,
int *dma_buf,
uint64_t *modifier)
{
if (!device->gralloc) {
/* get gralloc module for gralloc buffer info query */
int ret = hw_get_module(GRALLOC_HARDWARE_MODULE_ID,
(const hw_module_t **)&device->gralloc);
if (ret) {
/* This is *slightly* awkward, but if we are asked to import
* a gralloc handle, and there is no gralloc, it is some sort
* of invalid handle.
*/
return vk_startup_errorf(device->instance,
VK_ERROR_INVALID_EXTERNAL_HANDLE,
"Could not open gralloc\n");
}
const gralloc_module_t *gralloc = (const gralloc_module_t *) device->gralloc;
mesa_logi("opened gralloc module name: %s", gralloc->common.name);
/* TODO not sure qcom gralloc module name, but we should check
* for it here and move the special gmsm handling out of
* tu_gralloc_info_other()
*/
if (!strcmp(gralloc->common.name, cros_gralloc_module_name) && gralloc->perform) {
device->gralloc_type = TU_GRALLOC_CROS;
} else {
device->gralloc_type = TU_GRALLOC_OTHER;
}
}
if (device->gralloc_type == TU_GRALLOC_CROS) {
return tu_gralloc_info_cros(device, gralloc_info, dma_buf, modifier);
} else {
return tu_gralloc_info_other(device, gralloc_info, dma_buf, modifier);
}
}
/**
* Creates the VkImage using the gralloc handle in *gralloc_info.
*
* We support two different grallocs here, gbm_gralloc, and the qcom gralloc
* used on Android phones.
*/
VkResult
tu_import_memory_from_gralloc_handle(VkDevice device_h,
int dma_buf,
const VkAllocationCallbacks *alloc,
VkImage image_h)
{
struct tu_image *image = NULL;
VkResult result;
image = tu_image_from_handle(image_h);
VkDeviceMemory memory_h;
const VkMemoryDedicatedAllocateInfo ded_alloc = {
.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
.pNext = NULL,
.image = image_h,
.buffer = VK_NULL_HANDLE,
};
const VkImportMemoryFdInfoKHR import_info = {
.sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR,
.pNext = &ded_alloc,
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
.fd = os_dupfd_cloexec(dma_buf),
};
const VkMemoryAllocateInfo alloc_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.pNext = &import_info,
.allocationSize = image->total_size,
.memoryTypeIndex = 0,
};
result = tu_AllocateMemory(device_h, &alloc_info, alloc, &memory_h);
if (result != VK_SUCCESS) {
tu_DestroyImage(device_h, image_h, alloc);
return result;
}
VkBindImageMemoryInfo bind_info = {
.sType = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO,
.image = image_h,
.memory = memory_h,
.memoryOffset = 0,
};
tu_BindImageMemory2(device_h, 1, &bind_info);
image->owned_memory = memory_h;
return VK_SUCCESS;
}
static VkResult
format_supported_with_usage(VkDevice device_h, VkFormat format,
VkImageUsageFlags imageUsage)
{
VK_FROM_HANDLE(tu_device, device, device_h);
struct tu_physical_device *phys_dev = device->physical_device;
VkPhysicalDevice phys_dev_h = tu_physical_device_to_handle(phys_dev);
VkResult result;
/* WARNING: Android Nougat's libvulkan.so hardcodes the VkImageUsageFlags
* returned to applications via
* VkSurfaceCapabilitiesKHR::supportedUsageFlags.
* The relevant code in libvulkan/swapchain.cpp contains this fun comment:
*
* TODO(jessehall): I think these are right, but haven't thought hard
* about it. Do we need to query the driver for support of any of
* these?
*
* Any disagreement between this function and the hardcoded
* VkSurfaceCapabilitiesKHR:supportedUsageFlags causes tests
* dEQP-VK.wsi.android.swapchain.*.image_usage to fail.
*/
const VkPhysicalDeviceImageFormatInfo2 image_format_info = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
.format = format,
.type = VK_IMAGE_TYPE_2D,
.tiling = VK_IMAGE_TILING_OPTIMAL,
.usage = imageUsage,
};
VkImageFormatProperties2 image_format_props = {
.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2,
};
/* Check that requested format and usage are supported. */
result = tu_GetPhysicalDeviceImageFormatProperties2(
phys_dev_h, &image_format_info, &image_format_props);
if (result != VK_SUCCESS) {
return vk_errorf(device, result,
"tu_GetPhysicalDeviceImageFormatProperties2 failed "
"inside %s",
__func__);
}
return VK_SUCCESS;
}
static VkResult
setup_gralloc0_usage(struct tu_device *device, VkFormat format,
VkImageUsageFlags imageUsage, int *grallocUsage)
{
if (unmask32(&imageUsage, VK_IMAGE_USAGE_TRANSFER_DST_BIT |
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT))
*grallocUsage |= GRALLOC_USAGE_HW_RENDER;
if (unmask32(&imageUsage, VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
VK_IMAGE_USAGE_SAMPLED_BIT |
VK_IMAGE_USAGE_STORAGE_BIT |
VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT))
*grallocUsage |= GRALLOC_USAGE_HW_TEXTURE;
/* All VkImageUsageFlags not explicitly checked here are unsupported for
* gralloc swapchains.
*/
if (imageUsage != 0) {
return vk_errorf(device, VK_ERROR_FORMAT_NOT_SUPPORTED,
"unsupported VkImageUsageFlags(0x%x) for gralloc "
"swapchain",
imageUsage);
}
/*
* FINISHME: Advertise all display-supported formats. Mostly
* DRM_FORMAT_ARGB2101010 and DRM_FORMAT_ABGR2101010, but need to check
* what we need for 30-bit colors.
*/
if (format == VK_FORMAT_B8G8R8A8_UNORM ||
format == VK_FORMAT_B5G6R5_UNORM_PACK16) {
*grallocUsage |= GRALLOC_USAGE_HW_FB | GRALLOC_USAGE_HW_COMPOSER |
GRALLOC_USAGE_EXTERNAL_DISP;
}
if (*grallocUsage == 0)
return VK_ERROR_FORMAT_NOT_SUPPORTED;
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL
tu_GetSwapchainGrallocUsageANDROID(VkDevice device_h,
VkFormat format,
VkImageUsageFlags imageUsage,
int *grallocUsage)
{
VK_FROM_HANDLE(tu_device, device, device_h);
VkResult result;
result = format_supported_with_usage(device_h, format, imageUsage);
if (result != VK_SUCCESS)
return result;
*grallocUsage = 0;
return setup_gralloc0_usage(device, format, imageUsage, grallocUsage);
}
#if ANDROID_API_LEVEL >= 26
VKAPI_ATTR VkResult VKAPI_CALL
tu_GetSwapchainGrallocUsage2ANDROID(VkDevice device_h,
VkFormat format,
VkImageUsageFlags imageUsage,
VkSwapchainImageUsageFlagsANDROID swapchainImageUsage,
uint64_t *grallocConsumerUsage,
uint64_t *grallocProducerUsage)
{
VK_FROM_HANDLE(tu_device, device, device_h);
VkResult result;
*grallocConsumerUsage = 0;
*grallocProducerUsage = 0;
mesa_logd("%s: format=%d, usage=0x%x", __func__, format, imageUsage);
result = format_supported_with_usage(device_h, format, imageUsage);
if (result != VK_SUCCESS)
return result;
int32_t grallocUsage = 0;
result = setup_gralloc0_usage(device, format, imageUsage, &grallocUsage);
if (result != VK_SUCCESS)
return result;
/* Setup gralloc1 usage flags from gralloc0 flags. */
if (grallocUsage & GRALLOC_USAGE_HW_RENDER) {
*grallocProducerUsage |= GRALLOC1_PRODUCER_USAGE_GPU_RENDER_TARGET;
*grallocConsumerUsage |= GRALLOC1_CONSUMER_USAGE_CLIENT_TARGET;
}
if (grallocUsage & GRALLOC_USAGE_HW_TEXTURE) {
*grallocConsumerUsage |= GRALLOC1_CONSUMER_USAGE_GPU_TEXTURE;
}
if (grallocUsage & (GRALLOC_USAGE_HW_FB |
GRALLOC_USAGE_HW_COMPOSER |
GRALLOC_USAGE_EXTERNAL_DISP)) {
*grallocProducerUsage |= GRALLOC1_PRODUCER_USAGE_GPU_RENDER_TARGET;
*grallocConsumerUsage |= GRALLOC1_CONSUMER_USAGE_HWCOMPOSER;
}
return VK_SUCCESS;
}
#endif

12
src/freedreno/vulkan/tu_android.h
View File

@ -12,16 +12,4 @@
#include "tu_common.h"
VkResult
tu_gralloc_info(struct tu_device *device,
const VkNativeBufferANDROID *gralloc_info,
int *dma_buf,
uint64_t *modifier);
VkResult
tu_import_memory_from_gralloc_handle(VkDevice device_h,
int dma_buf,
const VkAllocationCallbacks *alloc,
VkImage image_h);
#endif /* TU_ANDROID_H */

14
src/freedreno/vulkan/tu_device.cc
View File

@ -22,6 +22,7 @@
#include "util/driconf.h"
#include "util/os_misc.h"
#include "util/u_process.h"
#include "vk_android.h"
#include "vk_shader_module.h"
#include "vk_sampler.h"
#include "vk_util.h"
@ -42,6 +43,10 @@
#include "tu_tracepoints.h"
#include "tu_wsi.h"
#if DETECT_OS_ANDROID
#include "util/u_gralloc/u_gralloc.h"
#endif
static int
tu_device_get_cache_uuid(struct tu_physical_device *device, void *uuid)
{
@ -281,9 +286,6 @@ get_device_extensions(const struct tu_physical_device *device,
/* For Graphics Flight Recorder (GFR) */
.AMD_buffer_marker = true,
#if DETECT_OS_ANDROID
.ANDROID_native_buffer = true,
#endif
.ARM_rasterization_order_attachment_access = true,
.GOOGLE_decorate_string = true,
.GOOGLE_hlsl_functionality1 = true,
@ -291,6 +293,12 @@ get_device_extensions(const struct tu_physical_device *device,
.IMG_filter_cubic = device->info->a6xx.has_tex_filter_cubic,
.VALVE_mutable_descriptor_type = true,
} };
#if DETECT_OS_ANDROID
if (vk_android_get_ugralloc() != NULL) {
ext->ANDROID_native_buffer = true;
}
#endif
}
static void

14
src/freedreno/vulkan/tu_device.h
View File

@ -251,15 +251,6 @@ struct tu_pvtmem_bo {
uint32_t per_fiber_size, per_sp_size;
};
#if DETECT_OS_ANDROID
enum tu_gralloc_type
{
TU_GRALLOC_UNKNOWN,
TU_GRALLOC_CROS,
TU_GRALLOC_OTHER,
};
#endif
struct tu_virtio_device;
struct tu_device
@ -394,11 +385,6 @@ struct tu_device
struct tu_cs *dbg_cmdbuf_stomp_cs;
struct tu_cs *dbg_renderpass_stomp_cs;
#if DETECT_OS_ANDROID
const void *gralloc;
enum tu_gralloc_type gralloc_type;
#endif
#ifdef TU_HAS_VIRTIO
struct tu_virtio_device *vdev;
#endif

50
src/freedreno/vulkan/tu_image.cc
View File

@ -13,10 +13,10 @@
#include "util/u_debug.h"
#include "util/format/u_format.h"
#include "vk_android.h"
#include "vk_util.h"
#include "drm-uapi/drm_fourcc.h"
#include "tu_android.h"
#include "tu_cs.h"
#include "tu_descriptor_set.h"
#include "tu_device.h"
@ -678,6 +678,7 @@ tu_CreateImage(VkDevice _device,
{
uint64_t modifier = DRM_FORMAT_MOD_INVALID;
const VkSubresourceLayout *plane_layouts = NULL;
VkResult result;
VK_FROM_HANDLE(tu_device, device, _device);
@ -731,22 +732,30 @@ tu_CreateImage(VkDevice _device,
modifier = DRM_FORMAT_MOD_LINEAR;
}
#if DETECT_OS_ANDROID
const VkNativeBufferANDROID *gralloc_info =
vk_find_struct_const(pCreateInfo->pNext, NATIVE_BUFFER_ANDROID);
int dma_buf;
if (gralloc_info) {
VkResult result = tu_gralloc_info(device, gralloc_info, &dma_buf, &modifier);
/* This section is removed by the optimizer for non-ANDROID builds */
VkImageDrmFormatModifierExplicitCreateInfoEXT eci;
VkSubresourceLayout a_plane_layouts[TU_MAX_PLANE_COUNT];
if (vk_image_is_android_native_buffer(&image->vk)) {
result = vk_android_get_anb_layout(
pCreateInfo, &eci, a_plane_layouts, TU_MAX_PLANE_COUNT);
if (result != VK_SUCCESS)
return result;
}
#endif
goto fail;
VkResult result = tu_image_init(device, image, pCreateInfo, modifier,
plane_layouts = a_plane_layouts;
modifier = eci.drmFormatModifier;
}
result = tu_image_init(device, image, pCreateInfo, modifier,
plane_layouts);
if (result != VK_SUCCESS) {
vk_object_free(&device->vk, alloc, image);
return result;
if (result != VK_SUCCESS)
goto fail;
/* This section is removed by the optimizer for non-ANDROID builds */
if (vk_image_is_android_native_buffer(&image->vk)) {
result = vk_android_import_anb(&device->vk, pCreateInfo, alloc,
&image->vk);
if (result != VK_SUCCESS)
goto fail;
}
TU_RMV(image_create, device, image);
@ -757,12 +766,10 @@ tu_CreateImage(VkDevice _device,
*pImage = tu_image_to_handle(image);
#if DETECT_OS_ANDROID
if (gralloc_info)
return tu_import_memory_from_gralloc_handle(_device, dma_buf, alloc,
*pImage);
#endif
return VK_SUCCESS;
fail:
vk_image_destroy(&device->vk, alloc, &image->vk);
return result;
}
VKAPI_ATTR void VKAPI_CALL
@ -782,11 +789,6 @@ tu_DestroyImage(VkDevice _device,
tu_perfetto_log_destroy_image(device, image);
#endif
#if DETECT_OS_ANDROID
if (image->owned_memory != VK_NULL_HANDLE)
tu_FreeMemory(_device, image->owned_memory, pAllocator);
#endif
vk_image_destroy(&device->vk, pAllocator, &image->vk);
}

7
src/freedreno/vulkan/tu_image.h
View File

@ -12,6 +12,8 @@
#include "tu_common.h"
#define TU_MAX_PLANE_COUNT 3
#define tu_image_view_stencil(iview, x) \
((iview->view.x & ~A6XX_##x##_COLOR_FORMAT__MASK) | A6XX_##x##_COLOR_FORMAT(FMT6_8_UINT))
@ -25,11 +27,6 @@ struct tu_image
struct fdl_layout layout[3];
uint64_t total_size;
#if DETECT_OS_ANDROID
/* For VK_ANDROID_native_buffer, the WSI image owns the memory, */
VkDeviceMemory owned_memory;
#endif
/* Set when bound */
struct tu_bo *bo;
uint64_t iova;