X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=rockchip.c;h=c6fc9ef1ec4bb29047c0cd5c9d804f0efa50b77f;hb=2426d0373145f74c7f8809786f7171c688fcddb2;hp=f039449545405572d8b3170d74ec42c7d8f87114;hpb=b016ffb90205a616b6f5c9484c4d44543cfc94d0;p=android-x86%2Fexternal-minigbm.git diff --git a/rockchip.c b/rockchip.c index f039449..c6fc9ef 100644 --- a/rockchip.c +++ b/rockchip.c @@ -7,47 +7,30 @@ #ifdef DRV_ROCKCHIP #include +#include +#include #include #include #include #include -#include #include "drv_priv.h" #include "helpers.h" #include "util.h" -static struct supported_combination combos[12] = { - {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE, - BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | - BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY}, - {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, - BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN}, - {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, - BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY}, - {DRM_FORMAT_NV12, DRM_FORMAT_MOD_NONE, - BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY}, - {DRM_FORMAT_NV12, DRM_FORMAT_MOD_NONE, - BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN}, - {DRM_FORMAT_RGB565, DRM_FORMAT_MOD_NONE, - BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY}, - {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE, - BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | - BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY}, - {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE, - BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN}, - {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, - BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN}, - {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, - BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY}, - {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE, - BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY}, - {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE, - BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN}, +struct rockchip_private_map_data { + void *cached_addr; + void *gem_addr; }; -static int afbc_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, - uint32_t format) +static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888, + DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888, + DRM_FORMAT_XRGB8888 }; + +static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_NV12, + DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID }; + +static int afbc_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, uint32_t format) { /* We've restricted ourselves to four bytes per pixel. */ const uint32_t pixel_size = 4; @@ -77,10 +60,8 @@ static int afbc_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, * alignement for the body plane. */ const uint32_t body_plane_alignment = 1024; - const uint32_t body_plane_offset = - ALIGN(header_plane_size, body_plane_alignment); - const uint32_t total_size = - body_plane_offset + body_plane_size; + const uint32_t body_plane_offset = ALIGN(header_plane_size, body_plane_alignment); + const uint32_t total_size = body_plane_offset + body_plane_size; bo->strides[0] = width_in_blocks * block_width * pixel_size; bo->sizes[0] = total_size; @@ -93,16 +74,93 @@ static int afbc_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, return 0; } +static int rockchip_add_kms_item(struct driver *drv, const struct kms_item *item) +{ + int ret; + uint32_t i, j; + uint64_t flags; + struct combination *combo; + struct format_metadata metadata; + + for (i = 0; i < drv->combos.size; i++) { + combo = &drv->combos.data[i]; + if (combo->format == item->format) { + if (item->modifier == DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC) { + flags = BO_USE_RENDERING | BO_USE_SCANOUT | BO_USE_TEXTURE; + metadata.modifier = item->modifier; + metadata.tiling = 0; + metadata.priority = 2; + + for (j = 0; j < ARRAY_SIZE(texture_source_formats); j++) { + if (item->format == texture_source_formats[j]) + flags &= ~BO_USE_RENDERING; + } + + ret = drv_add_combination(drv, item[i].format, &metadata, flags); + if (ret) + return ret; + } else { + combo->usage |= item->usage; + } + } + } + + return 0; +} + static int rockchip_init(struct driver *drv) { - drv_insert_combinations(drv, combos, ARRAY_SIZE(combos)); - return drv_add_kms_flags(drv); + int ret; + uint32_t i, num_items; + struct kms_item *items; + struct format_metadata metadata; + + metadata.tiling = 0; + metadata.priority = 1; + metadata.modifier = DRM_FORMAT_MOD_NONE; + + ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), + &metadata, BO_USE_RENDER_MASK); + if (ret) + return ret; + + ret = drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats), + &metadata, BO_USE_TEXTURE_MASK); + if (ret) + return ret; + + drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT); + drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT); + + /* Camera ISP supports only NV12 output. */ + drv_modify_combination(drv, DRM_FORMAT_NV12, &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, &metadata, + BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE); + + items = drv_query_kms(drv, &num_items); + if (!items || !num_items) + return 0; + + for (i = 0; i < num_items; i++) { + ret = rockchip_add_kms_item(drv, &items[i]); + if (ret) { + free(items); + return ret; + } + } + + free(items); + return 0; } static bool has_modifier(const uint64_t *list, uint32_t count, uint64_t modifier) { uint32_t i; - for (i = 0; i < count; i++) if (list[i] == modifier) return true; @@ -110,10 +168,8 @@ static bool has_modifier(const uint64_t *list, uint32_t count, uint64_t modifier return false; } -static int rockchip_bo_create_with_modifiers(struct bo *bo, - uint32_t width, uint32_t height, - uint32_t format, - const uint64_t *modifiers, +static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t height, + uint32_t format, const uint64_t *modifiers, uint32_t count) { int ret; @@ -122,16 +178,15 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, if (format == DRM_FORMAT_NV12) { uint32_t w_mbs = DIV_ROUND_UP(ALIGN(width, 16), 16); - uint32_t h_mbs = DIV_ROUND_UP(ALIGN(width, 16), 16); + uint32_t h_mbs = DIV_ROUND_UP(ALIGN(height, 16), 16); uint32_t aligned_width = w_mbs * 16; uint32_t aligned_height = DIV_ROUND_UP(h_mbs * 16 * 3, 2); drv_bo_from_format(bo, aligned_width, height, format); - bo->total_size = bo->strides[0] * aligned_height - + w_mbs * h_mbs * 128; - } else if (has_modifier(modifiers, count, - DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC)) { + bo->total_size = bo->strides[0] * aligned_height + w_mbs * h_mbs * 128; + } else if (width <= 2560 && + has_modifier(modifiers, count, DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC)) { /* If the caller has decided they can use AFBC, always * pick that */ afbc_bo_from_format(bo, width, height, format); @@ -141,18 +196,31 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, fprintf(stderr, "no usable modifier found\n"); return -1; } - drv_bo_from_format(bo, width, height, format); + + uint32_t stride; + /* + * Since the ARM L1 cache line size is 64 bytes, align to that + * as a performance optimization. For YV12, the Mali cmem allocator + * requires that chroma planes are aligned to 64-bytes, so align the + * luma plane to 128 bytes. + */ + stride = drv_stride_from_format(format, width, 0); + if (format == DRM_FORMAT_YVU420 || format == DRM_FORMAT_YVU420_ANDROID) + stride = ALIGN(stride, 128); + else + stride = ALIGN(stride, 64); + + drv_bo_from_format(bo, stride, height, format); } memset(&gem_create, 0, sizeof(gem_create)); gem_create.size = bo->total_size; - ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_CREATE, - &gem_create); + ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_CREATE, &gem_create); if (ret) { - fprintf(stderr, "drv: DRM_IOCTL_ROCKCHIP_GEM_CREATE failed " - "(size=%llu)\n", gem_create.size); + fprintf(stderr, "drv: DRM_IOCTL_ROCKCHIP_GEM_CREATE failed (size=%llu)\n", + gem_create.size); return ret; } @@ -162,19 +230,19 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, return 0; } -static int rockchip_bo_create(struct bo *bo, uint32_t width, uint32_t height, - uint32_t format, uint32_t flags) +static int rockchip_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format, + uint32_t flags) { uint64_t modifiers[] = { DRM_FORMAT_MOD_NONE }; - - return rockchip_bo_create_with_modifiers(bo, width, height, format, - modifiers, ARRAY_SIZE(modifiers)); + return rockchip_bo_create_with_modifiers(bo, width, height, format, modifiers, + ARRAY_SIZE(modifiers)); } -static void *rockchip_bo_map(struct bo *bo, struct map_info *data, size_t plane) +static void *rockchip_bo_map(struct bo *bo, struct map_info *data, size_t plane, int prot) { int ret; struct drm_rockchip_gem_map_off gem_map; + struct rockchip_private_map_data *priv; /* We can only map buffers created with SW access flags, which should * have no modifiers (ie, not AFBC). */ @@ -184,24 +252,57 @@ static void *rockchip_bo_map(struct bo *bo, struct map_info *data, size_t plane) memset(&gem_map, 0, sizeof(gem_map)); gem_map.handle = bo->handles[0].u32; - ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET, - &gem_map); + ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET, &gem_map); if (ret) { - fprintf(stderr, - "drv: DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET failed\n"); + fprintf(stderr, "drv: DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET failed\n"); return MAP_FAILED; } + void *addr = mmap(0, bo->total_size, prot, MAP_SHARED, bo->drv->fd, gem_map.offset); + data->length = bo->total_size; - return mmap(0, bo->total_size, PROT_READ | PROT_WRITE, MAP_SHARED, - bo->drv->fd, gem_map.offset); + if (bo->flags & BO_USE_RENDERSCRIPT) { + priv = calloc(1, sizeof(*priv)); + priv->cached_addr = calloc(1, bo->total_size); + priv->gem_addr = addr; + memcpy(priv->cached_addr, priv->gem_addr, bo->total_size); + data->priv = priv; + addr = priv->cached_addr; + } + + return addr; +} + +static int rockchip_bo_unmap(struct bo *bo, struct map_info *data) +{ + if (data->priv) { + struct rockchip_private_map_data *priv = data->priv; + data->addr = priv->gem_addr; + free(priv->cached_addr); + free(priv); + data->priv = NULL; + } + + return munmap(data->addr, data->length); +} + +static int rockchip_bo_flush(struct bo *bo, struct map_info *data) +{ + struct rockchip_private_map_data *priv = data->priv; + if (priv) + memcpy(priv->gem_addr, priv->cached_addr, bo->total_size); + + return 0; } -static uint32_t rockchip_resolve_format(uint32_t format) +static uint32_t rockchip_resolve_format(uint32_t format, uint64_t usage) { switch (format) { case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED: + /* Camera subsystem requires NV12. */ + if (usage & (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: @@ -211,8 +312,7 @@ static uint32_t rockchip_resolve_format(uint32_t format) } } -struct backend backend_rockchip = -{ +struct backend backend_rockchip = { .name = "rockchip", .init = rockchip_init, .bo_create = rockchip_bo_create, @@ -220,6 +320,8 @@ struct backend backend_rockchip = .bo_destroy = drv_gem_bo_destroy, .bo_import = drv_prime_bo_import, .bo_map = rockchip_bo_map, + .bo_unmap = rockchip_bo_unmap, + .bo_flush = rockchip_bo_flush, .resolve_format = rockchip_resolve_format, };