X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=amdgpu.c;h=1a68a5b78155677ef179cff9ab59b320322ef22b;hb=9c3fb32dd4a8b9a3cf870c533d1e88dd542d7c16;hp=8e3c778803cd8fb597be5e6214d4025cd1e5f8f9;hpb=6b41fb55deae7d8ae00c33f7ce849d6fd6525d77;p=android-x86%2Fexternal-minigbm.git diff --git a/amdgpu.c b/amdgpu.c index 8e3c778..1a68a5b 100644 --- a/amdgpu.c +++ b/amdgpu.c @@ -4,14 +4,14 @@ * found in the LICENSE file. */ #ifdef DRV_AMDGPU +#include +#include #include #include #include #include #include #include -#include -#include #include "addrinterface.h" #include "drv_priv.h" @@ -22,6 +22,7 @@ #define CIASICIDGFXENGINE_SOUTHERNISLAND 0x0000000A #endif +// clang-format off #define mmCC_RB_BACKEND_DISABLE 0x263d #define mmGB_TILE_MODE0 0x2644 #define mmGB_MACROTILE_MODE0 0x2664 @@ -38,15 +39,23 @@ enum { FAMILY_PI, FAMILY_LAST, }; +// clang-format on -const static uint32_t supported_formats[] = { - DRM_FORMAT_ARGB8888, DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888 +struct amdgpu_priv { + void *addrlib; + int drm_version; }; -static int amdgpu_set_metadata(int fd, uint32_t handle, - struct amdgpu_bo_metadata *info) +const static uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888, + DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888, + DRM_FORMAT_XRGB8888 }; + +const static uint32_t texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_R8, DRM_FORMAT_NV21, + DRM_FORMAT_NV12, DRM_FORMAT_YVU420_ANDROID }; + +static int amdgpu_set_metadata(int fd, uint32_t handle, struct amdgpu_bo_metadata *info) { - struct drm_amdgpu_gem_metadata args = {0}; + struct drm_amdgpu_gem_metadata args = { 0 }; if (!info) return -EINVAL; @@ -64,18 +73,16 @@ static int amdgpu_set_metadata(int fd, uint32_t handle, memcpy(args.data.data, info->umd_metadata, info->size_metadata); } - return drmCommandWriteRead(fd, DRM_AMDGPU_GEM_METADATA, &args, - sizeof(args)); + return drmCommandWriteRead(fd, DRM_AMDGPU_GEM_METADATA, &args, sizeof(args)); } -static int amdgpu_read_mm_regs(int fd, unsigned dword_offset, - unsigned count, uint32_t instance, +static int amdgpu_read_mm_regs(int fd, unsigned dword_offset, unsigned count, uint32_t instance, uint32_t flags, uint32_t *values) { struct drm_amdgpu_info request; memset(&request, 0, sizeof(request)); - request.return_pointer = (uintptr_t) values; + request.return_pointer = (uintptr_t)values; request.return_size = count * sizeof(uint32_t); request.query = AMDGPU_INFO_READ_MMR_REG; request.read_mmr_reg.dword_offset = dword_offset; @@ -83,8 +90,7 @@ static int amdgpu_read_mm_regs(int fd, unsigned dword_offset, request.read_mmr_reg.instance = instance; request.read_mmr_reg.flags = flags; - return drmCommandWrite(fd, DRM_AMDGPU_INFO, &request, - sizeof(struct drm_amdgpu_info)); + return drmCommandWrite(fd, DRM_AMDGPU_INFO, &request, sizeof(struct drm_amdgpu_info)); } static int amdgpu_query_gpu(int fd, struct amdgpu_gpu_info *gpu_info) @@ -95,19 +101,16 @@ static int amdgpu_query_gpu(int fd, struct amdgpu_gpu_info *gpu_info) if (!gpu_info) return -EINVAL; - instance = AMDGPU_INFO_MMR_SH_INDEX_MASK << - AMDGPU_INFO_MMR_SH_INDEX_SHIFT; + instance = AMDGPU_INFO_MMR_SH_INDEX_MASK << AMDGPU_INFO_MMR_SH_INDEX_SHIFT; ret = amdgpu_read_mm_regs(fd, mmCC_RB_BACKEND_DISABLE, 1, instance, 0, &gpu_info->backend_disable[0]); if (ret) return ret; /* extract bitfield CC_RB_BACKEND_DISABLE.BACKEND_DISABLE */ - gpu_info->backend_disable[0] = - (gpu_info->backend_disable[0] >> 16) & 0xff; + gpu_info->backend_disable[0] = (gpu_info->backend_disable[0] >> 16) & 0xff; - ret = amdgpu_read_mm_regs(fd, mmGB_TILE_MODE0, 32, 0xffffffff, 0, - gpu_info->gb_tile_mode); + ret = amdgpu_read_mm_regs(fd, mmGB_TILE_MODE0, 32, 0xffffffff, 0, gpu_info->gb_tile_mode); if (ret) return ret; @@ -116,13 +119,11 @@ static int amdgpu_query_gpu(int fd, struct amdgpu_gpu_info *gpu_info) if (ret) return ret; - ret = amdgpu_read_mm_regs(fd, mmGB_ADDR_CONFIG, 1, 0xffffffff, 0, - &gpu_info->gb_addr_cfg); + ret = amdgpu_read_mm_regs(fd, mmGB_ADDR_CONFIG, 1, 0xffffffff, 0, &gpu_info->gb_addr_cfg); if (ret) return ret; - ret = amdgpu_read_mm_regs(fd, mmMC_ARB_RAMCFG, 1, 0xffffffff, 0, - &gpu_info->mc_arb_ramcfg); + ret = amdgpu_read_mm_regs(fd, mmMC_ARB_RAMCFG, 1, 0xffffffff, 0, &gpu_info->mc_arb_ramcfg); if (ret) return ret; @@ -140,27 +141,28 @@ static ADDR_E_RETURNCODE ADDR_API free_sys_mem(const ADDR_FREESYSMEM_INPUT *in) return ADDR_OK; } -static int amdgpu_addrlib_compute(void *addrlib, uint32_t width, - uint32_t height, uint32_t format, - uint32_t usage, uint32_t *tiling_flags, +static int amdgpu_addrlib_compute(void *addrlib, uint32_t width, uint32_t height, uint32_t format, + uint64_t use_flags, uint32_t *tiling_flags, ADDR_COMPUTE_SURFACE_INFO_OUTPUT *addr_out) { - ADDR_COMPUTE_SURFACE_INFO_INPUT addr_surf_info_in = {0}; - ADDR_TILEINFO addr_tile_info = {0}; - ADDR_TILEINFO addr_tile_info_out = {0}; + ADDR_COMPUTE_SURFACE_INFO_INPUT addr_surf_info_in = { 0 }; + ADDR_TILEINFO addr_tile_info = { 0 }; + ADDR_TILEINFO addr_tile_info_out = { 0 }; + uint32_t bits_per_pixel; addr_surf_info_in.size = sizeof(ADDR_COMPUTE_SURFACE_INFO_INPUT); /* Set the requested tiling mode. */ addr_surf_info_in.tileMode = ADDR_TM_2D_TILED_THIN1; - if (usage & (BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | - BO_USE_SW_WRITE_OFTEN)) + if (use_flags & + (BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN)) addr_surf_info_in.tileMode = ADDR_TM_LINEAR_ALIGNED; else if (width <= 16 || height <= 16) addr_surf_info_in.tileMode = ADDR_TM_1D_TILED_THIN1; + bits_per_pixel = drv_stride_from_format(format, 1, 0) * 8; /* Bits per pixel should be calculated from format*/ - addr_surf_info_in.bpp = drv_bpp_from_format(format, 0); + addr_surf_info_in.bpp = bits_per_pixel; addr_surf_info_in.numSamples = 1; addr_surf_info_in.width = width; addr_surf_info_in.height = height; @@ -172,7 +174,7 @@ static int amdgpu_addrlib_compute(void *addrlib, uint32_t width, addr_surf_info_in.flags.noStencil = 1; /* Set the micro tile type. */ - if (usage & BO_USE_SCANOUT) + if (use_flags & BO_USE_SCANOUT) addr_surf_info_in.tileType = ADDR_DISPLAYABLE; else addr_surf_info_in.tileType = ADDR_NON_DISPLAYABLE; @@ -180,13 +182,12 @@ static int amdgpu_addrlib_compute(void *addrlib, uint32_t width, addr_out->size = sizeof(ADDR_COMPUTE_SURFACE_INFO_OUTPUT); addr_out->pTileInfo = &addr_tile_info_out; - if (AddrComputeSurfaceInfo(addrlib, &addr_surf_info_in, - addr_out) != ADDR_OK) + if (AddrComputeSurfaceInfo(addrlib, &addr_surf_info_in, addr_out) != ADDR_OK) return -EINVAL; - ADDR_CONVERT_TILEINFOTOHW_INPUT s_in = {0}; - ADDR_CONVERT_TILEINFOTOHW_OUTPUT s_out = {0}; - ADDR_TILEINFO s_tile_hw_info_out = {0}; + ADDR_CONVERT_TILEINFOTOHW_INPUT s_in = { 0 }; + ADDR_CONVERT_TILEINFOTOHW_OUTPUT s_out = { 0 }; + ADDR_TILEINFO s_tile_hw_info_out = { 0 }; s_in.size = sizeof(ADDR_CONVERT_TILEINFOTOHW_INPUT); /* Convert from real value to HW value */ @@ -210,16 +211,13 @@ static int amdgpu_addrlib_compute(void *addrlib, uint32_t width, /* LINEAR_ALIGNED */ *tiling_flags |= AMDGPU_TILING_SET(ARRAY_MODE, 1); - *tiling_flags |= AMDGPU_TILING_SET(BANK_WIDTH, - drv_log_base2(addr_tile_info_out.bankWidth)); - *tiling_flags |= AMDGPU_TILING_SET(BANK_HEIGHT, - drv_log_base2(addr_tile_info_out.bankHeight)); - *tiling_flags |= AMDGPU_TILING_SET(TILE_SPLIT, - s_tile_hw_info_out.tileSplitBytes); + *tiling_flags |= AMDGPU_TILING_SET(BANK_WIDTH, drv_log_base2(addr_tile_info_out.bankWidth)); + *tiling_flags |= + AMDGPU_TILING_SET(BANK_HEIGHT, drv_log_base2(addr_tile_info_out.bankHeight)); + *tiling_flags |= AMDGPU_TILING_SET(TILE_SPLIT, s_tile_hw_info_out.tileSplitBytes); *tiling_flags |= AMDGPU_TILING_SET(MACRO_TILE_ASPECT, - drv_log_base2(addr_tile_info_out.macroAspectRatio)); - *tiling_flags |= AMDGPU_TILING_SET(PIPE_CONFIG, - s_tile_hw_info_out.pipeConfig); + drv_log_base2(addr_tile_info_out.macroAspectRatio)); + *tiling_flags |= AMDGPU_TILING_SET(PIPE_CONFIG, s_tile_hw_info_out.pipeConfig); *tiling_flags |= AMDGPU_TILING_SET(NUM_BANKS, s_tile_hw_info_out.banks); return 0; @@ -228,21 +226,21 @@ static int amdgpu_addrlib_compute(void *addrlib, uint32_t width, static void *amdgpu_addrlib_init(int fd) { int ret; - ADDR_CREATE_INPUT addr_create_input = {0}; - ADDR_CREATE_OUTPUT addr_create_output = {0}; - ADDR_REGISTER_VALUE reg_value = {0}; - ADDR_CREATE_FLAGS create_flags = { {0} }; + ADDR_CREATE_INPUT addr_create_input = { 0 }; + ADDR_CREATE_OUTPUT addr_create_output = { 0 }; + ADDR_REGISTER_VALUE reg_value = { 0 }; + ADDR_CREATE_FLAGS create_flags = { { 0 } }; ADDR_E_RETURNCODE addr_ret; addr_create_input.size = sizeof(ADDR_CREATE_INPUT); addr_create_output.size = sizeof(ADDR_CREATE_OUTPUT); - struct amdgpu_gpu_info gpu_info = {0}; + struct amdgpu_gpu_info gpu_info = { 0 }; ret = amdgpu_query_gpu(fd, &gpu_info); if (ret) { - fprintf(stderr, "[%s]failed with error =%d\n", __func__, ret); + drv_log("failed with error =%d\n", ret); return NULL; } @@ -252,11 +250,10 @@ static void *amdgpu_addrlib_init(int fd) reg_value.backendDisables = gpu_info.backend_disable[0]; reg_value.pTileConfig = gpu_info.gb_tile_mode; - reg_value.noOfEntries = sizeof(gpu_info.gb_tile_mode) - / sizeof(gpu_info.gb_tile_mode[0]); + reg_value.noOfEntries = sizeof(gpu_info.gb_tile_mode) / sizeof(gpu_info.gb_tile_mode[0]); reg_value.pMacroTileConfig = gpu_info.gb_macro_tile_mode; - reg_value.noOfMacroEntries = sizeof(gpu_info.gb_macro_tile_mode) - / sizeof(gpu_info.gb_macro_tile_mode[0]); + reg_value.noOfMacroEntries = + sizeof(gpu_info.gb_macro_tile_mode) / sizeof(gpu_info.gb_macro_tile_mode[0]); create_flags.value = 0; create_flags.useTileIndex = 1; @@ -272,7 +269,7 @@ static void *amdgpu_addrlib_init(int fd) addr_ret = AddrCreate(&addr_create_input, &addr_create_output); if (addr_ret != ADDR_OK) { - fprintf(stderr, "[%s]failed error =%d\n", __func__, addr_ret); + drv_log("failed error =%d\n", addr_ret); return NULL; } @@ -281,155 +278,204 @@ static void *amdgpu_addrlib_init(int fd) static int amdgpu_init(struct driver *drv) { - int ret; - void *addrlib; + struct amdgpu_priv *priv; + drmVersionPtr drm_version; struct format_metadata metadata; - uint32_t flags = BO_COMMON_USE_MASK; + uint64_t use_flags = BO_USE_RENDER_MASK; + + priv = calloc(1, sizeof(struct amdgpu_priv)); + if (!priv) + return -1; + + drm_version = drmGetVersion(drv_get_fd(drv)); + if (!drm_version) { + free(priv); + return -1; + } + + priv->drm_version = drm_version->version_minor; + drmFreeVersion(drm_version); - addrlib = amdgpu_addrlib_init(drv_get_fd(drv)); - if (!addrlib) + priv->addrlib = amdgpu_addrlib_init(drv_get_fd(drv)); + if (!priv->addrlib) { + free(priv); return -1; + } + + drv->priv = priv; - drv->priv = addrlib; + drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats), + &LINEAR_METADATA, BO_USE_TEXTURE_MASK); + + /* YUV format for camera */ + drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA, + BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE); + /* + * R8 format is used for Android's HAL_PIXEL_FORMAT_BLOB and is used for JPEG snapshots + * from camera. + */ + drv_modify_combination(drv, DRM_FORMAT_R8, &LINEAR_METADATA, + BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE); + + drv_modify_combination(drv, DRM_FORMAT_NV21, &LINEAR_METADATA, BO_USE_SCANOUT); + drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA, BO_USE_SCANOUT); metadata.tiling = ADDR_DISPLAYABLE << 16 | ADDR_TM_LINEAR_ALIGNED; - metadata.priority = 1; - metadata.modifier = DRM_FORMAT_MOD_NONE; + metadata.priority = 2; + metadata.modifier = DRM_FORMAT_MOD_LINEAR; - ret = drv_add_combinations(drv, supported_formats, - ARRAY_SIZE(supported_formats), &metadata, - flags); - if (ret) - return ret; + drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), + &metadata, use_flags); - drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata, - BO_USE_CURSOR | BO_USE_SCANOUT); - drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata, - BO_USE_CURSOR | BO_USE_SCANOUT); - drv_modify_combination(drv, DRM_FORMAT_XBGR8888, &metadata, - BO_USE_SCANOUT); + drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT); + drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT); + drv_modify_combination(drv, DRM_FORMAT_XBGR8888, &metadata, BO_USE_SCANOUT); metadata.tiling = ADDR_NON_DISPLAYABLE << 16 | ADDR_TM_LINEAR_ALIGNED; - metadata.priority = 2; - metadata.modifier = DRM_FORMAT_MOD_NONE; + metadata.priority = 3; + metadata.modifier = DRM_FORMAT_MOD_LINEAR; - ret = drv_add_combinations(drv, supported_formats, - ARRAY_SIZE(supported_formats), &metadata, - flags); - if (ret) - return ret; + drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), + &metadata, use_flags); - flags &= ~BO_USE_SW_WRITE_OFTEN; - flags &= ~BO_USE_SW_READ_OFTEN; - flags &= ~BO_USE_LINEAR; + use_flags &= ~BO_USE_SW_WRITE_OFTEN; + use_flags &= ~BO_USE_SW_READ_OFTEN; + use_flags &= ~BO_USE_LINEAR; metadata.tiling = ADDR_DISPLAYABLE << 16 | ADDR_TM_2D_TILED_THIN1; - metadata.priority = 3; + metadata.priority = 4; - ret = drv_add_combinations(drv, supported_formats, - ARRAY_SIZE(supported_formats), &metadata, - flags); - if (ret) - return ret; + drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), + &metadata, use_flags); - drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata, - BO_USE_SCANOUT); - drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata, - BO_USE_SCANOUT); - drv_modify_combination(drv, DRM_FORMAT_XBGR8888, &metadata, - BO_USE_SCANOUT); + drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata, BO_USE_SCANOUT); + drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata, BO_USE_SCANOUT); + drv_modify_combination(drv, DRM_FORMAT_XBGR8888, &metadata, BO_USE_SCANOUT); metadata.tiling = ADDR_NON_DISPLAYABLE << 16 | ADDR_TM_2D_TILED_THIN1; - metadata.priority = 4; + metadata.priority = 5; - ret = drv_add_combinations(drv, supported_formats, - ARRAY_SIZE(supported_formats), &metadata, - flags); - if (ret) - return ret; + drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), + &metadata, use_flags); - return ret; + return 0; } static void amdgpu_close(struct driver *drv) { - AddrDestroy(drv->priv); + struct amdgpu_priv *priv = (struct amdgpu_priv *)drv->priv; + AddrDestroy(priv->addrlib); + free(priv); drv->priv = NULL; } -static int amdgpu_bo_create(struct bo *bo, uint32_t width, uint32_t height, - uint32_t format, uint32_t usage) +static int amdgpu_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format, + uint64_t use_flags) { - void *addrlib = bo->drv->priv; + struct amdgpu_priv *priv = (struct amdgpu_priv *)bo->drv->priv; + void *addrlib = priv->addrlib; union drm_amdgpu_gem_create gem_create; - struct amdgpu_bo_metadata metadata = {0}; - ADDR_COMPUTE_SURFACE_INFO_OUTPUT addr_out = {0}; + struct amdgpu_bo_metadata metadata = { 0 }; + ADDR_COMPUTE_SURFACE_INFO_OUTPUT addr_out = { 0 }; uint32_t tiling_flags = 0; - uint32_t gem_create_flags = 0; + size_t plane; int ret; - if (amdgpu_addrlib_compute(addrlib, width, - height, format, usage, - &tiling_flags, - &addr_out) < 0) - return -EINVAL; - - bo->tiling = tiling_flags; - bo->offsets[0] = 0; - bo->sizes[0] = addr_out.surfSize; - bo->strides[0] = addr_out.pixelPitch - * DIV_ROUND_UP(addr_out.pixelBits, 8); - if (usage & (BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | - BO_USE_SW_WRITE_OFTEN | BO_USE_SW_WRITE_RARELY | - BO_USE_SW_READ_RARELY)) - gem_create_flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED; - else - gem_create_flags |= AMDGPU_GEM_CREATE_NO_CPU_ACCESS; + if (format == DRM_FORMAT_NV12 || format == DRM_FORMAT_NV21) { + drv_bo_from_format(bo, ALIGN(width, 64), height, format); + } else if (format == DRM_FORMAT_YVU420_ANDROID) { + drv_bo_from_format(bo, ALIGN(width, 128), height, format); + } else { + if (amdgpu_addrlib_compute(addrlib, width, height, format, use_flags, &tiling_flags, + &addr_out) < 0) + return -EINVAL; + + bo->tiling = tiling_flags; + /* RGB has 1 plane only */ + bo->offsets[0] = 0; + bo->total_size = bo->sizes[0] = addr_out.surfSize; + bo->strides[0] = addr_out.pixelPitch * DIV_ROUND_UP(addr_out.pixelBits, 8); + } memset(&gem_create, 0, sizeof(gem_create)); - gem_create.in.bo_size = bo->sizes[0]; + + gem_create.in.bo_size = bo->total_size; gem_create.in.alignment = addr_out.baseAlign; /* Set the placement. */ - gem_create.in.domains = AMDGPU_GEM_DOMAIN_VRAM; - gem_create.in.domain_flags = gem_create_flags; + + gem_create.in.domain_flags = 0; + if (use_flags & (BO_USE_LINEAR | BO_USE_SW)) + gem_create.in.domain_flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED; + + if (use_flags & (BO_USE_SCANOUT | BO_USE_CURSOR)) { + /* TODO(dbehr) do not use VRAM after we enable display VM */ + gem_create.in.domains = AMDGPU_GEM_DOMAIN_VRAM; + } else { + gem_create.in.domains = AMDGPU_GEM_DOMAIN_GTT; + if (!(use_flags & BO_USE_SW_READ_OFTEN)) + gem_create.in.domain_flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC; + } + + /* If drm_version >= 21 everything exposes explicit synchronization primitives + and chromeos/arc++ will use them. Disable implicit synchronization. */ + if (priv->drm_version >= 21) { + gem_create.in.domain_flags |= AMDGPU_GEM_CREATE_EXPLICIT_SYNC; + } /* Allocate the buffer with the preferred heap. */ - ret = drmCommandWriteRead(drv_get_fd(bo->drv), DRM_AMDGPU_GEM_CREATE, - &gem_create, sizeof(gem_create)); + ret = drmCommandWriteRead(drv_get_fd(bo->drv), DRM_AMDGPU_GEM_CREATE, &gem_create, + sizeof(gem_create)); if (ret < 0) return ret; - bo->handles[0].u32 = gem_create.out.handle; - metadata.tiling_info = tiling_flags; - ret = amdgpu_set_metadata(drv_get_fd(bo->drv), - bo->handles[0].u32, &metadata); + for (plane = 0; plane < bo->num_planes; plane++) + bo->handles[plane].u32 = gem_create.out.handle; + + ret = amdgpu_set_metadata(drv_get_fd(bo->drv), bo->handles[0].u32, &metadata); return ret; } -static void *amdgpu_bo_map(struct bo *bo, struct map_info *data, size_t plane) +static void *amdgpu_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags) { int ret; union drm_amdgpu_gem_mmap gem_map; memset(&gem_map, 0, sizeof(gem_map)); - gem_map.in.handle = bo->handles[0].u32; + gem_map.in.handle = bo->handles[plane].u32; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_AMDGPU_GEM_MMAP, &gem_map); if (ret) { - fprintf(stderr, "drv: DRM_IOCTL_AMDGPU_GEM_MMAP failed\n"); + drv_log("DRM_IOCTL_AMDGPU_GEM_MMAP failed\n"); return MAP_FAILED; } - data->length = bo->sizes[0]; - return mmap(0, bo->sizes[0], PROT_READ | PROT_WRITE, MAP_SHARED, - bo->drv->fd, gem_map.out.addr_ptr); + vma->length = bo->total_size; + + return mmap(0, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd, + gem_map.out.addr_ptr); +} + +static uint32_t amdgpu_resolve_format(uint32_t format, uint64_t use_flags) +{ + switch (format) { + case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED: + /* Camera subsystem requires NV12. */ + if (use_flags & (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE)) + return DRM_FORMAT_NV12; + /*HACK: See b/28671744 */ + return DRM_FORMAT_XBGR8888; + case DRM_FORMAT_FLEX_YCbCr_420_888: + return DRM_FORMAT_NV12; + default: + return format; + } } -struct backend backend_amdgpu = { +const struct backend backend_amdgpu = { .name = "amdgpu", .init = amdgpu_init, .close = amdgpu_close, @@ -437,7 +483,8 @@ struct backend backend_amdgpu = { .bo_destroy = drv_gem_bo_destroy, .bo_import = drv_prime_bo_import, .bo_map = amdgpu_bo_map, + .bo_unmap = drv_bo_munmap, + .resolve_format = amdgpu_resolve_format, }; #endif -