X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=i915.c;h=70ecc5aa31806413b6714612405b629169097b64;hb=3122213d9a5570e5b7dfbfab496d7c8da0721efb;hp=adf2739cb4e7fb336342cb62d0c6e6a474f3df9e;hpb=e821cc2e6323d13080db32569709a857f52ba29c;p=android-x86%2Fexternal-minigbm.git diff --git a/i915.c b/i915.c index adf2739..70ecc5a 100644 --- a/i915.c +++ b/i915.c @@ -57,8 +57,8 @@ static int i915_add_kms_item(struct driver *drv, const struct kms_item *item) * Older hardware can't scanout Y-tiled formats. Newer devices can, and * report this functionality via format modifiers. */ - for (i = 0; i < drv->backend->combos.size; i++) { - combo = &drv->backend->combos.data[i]; + for (i = 0; i < drv->combos.size; i++) { + combo = &drv->combos.data[i]; if (combo->format != item->format) continue; @@ -70,11 +70,11 @@ static int i915_add_kms_item(struct driver *drv, const struct kms_item *item) * buffers, so let's add this to our combinations, except for * cursor, which must not be tiled. */ - combo->usage |= item->usage & ~BO_USE_CURSOR; + combo->use_flags |= item->use_flags & ~BO_USE_CURSOR; } if (combo->metadata.modifier == item->modifier) - combo->usage |= item->usage; + combo->use_flags |= item->use_flags; } return 0; @@ -86,54 +86,66 @@ static int i915_add_combinations(struct driver *drv) uint32_t i, num_items; struct kms_item *items; struct format_metadata metadata; - uint64_t render_flags, texture_flags; + uint64_t render_use_flags, texture_use_flags; - render_flags = BO_USE_RENDER_MASK; - texture_flags = BO_USE_TEXTURE_MASK; + render_use_flags = BO_USE_RENDER_MASK; + texture_use_flags = BO_USE_TEXTURE_MASK; metadata.tiling = I915_TILING_NONE; metadata.priority = 1; metadata.modifier = DRM_FORMAT_MOD_NONE; ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), - &metadata, render_flags); + &metadata, render_use_flags); if (ret) return ret; ret = drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats), - &metadata, texture_flags); + &metadata, texture_use_flags); if (ret) return ret; ret = drv_add_combinations(drv, tileable_texture_source_formats, ARRAY_SIZE(tileable_texture_source_formats), &metadata, - texture_flags); + texture_use_flags); 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); - render_flags &= ~BO_USE_SW_WRITE_OFTEN; - render_flags &= ~BO_USE_SW_READ_OFTEN; - render_flags &= ~BO_USE_LINEAR; + /* IPU3 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); - texture_flags &= ~BO_USE_SW_WRITE_OFTEN; - texture_flags &= ~BO_USE_SW_READ_OFTEN; - texture_flags &= ~BO_USE_LINEAR; + render_use_flags &= ~BO_USE_RENDERSCRIPT; + render_use_flags &= ~BO_USE_SW_WRITE_OFTEN; + render_use_flags &= ~BO_USE_SW_READ_OFTEN; + render_use_flags &= ~BO_USE_LINEAR; + + texture_use_flags &= ~BO_USE_RENDERSCRIPT; + texture_use_flags &= ~BO_USE_SW_WRITE_OFTEN; + texture_use_flags &= ~BO_USE_SW_READ_OFTEN; + texture_use_flags &= ~BO_USE_LINEAR; metadata.tiling = I915_TILING_X; metadata.priority = 2; metadata.modifier = I915_FORMAT_MOD_X_TILED; ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), - &metadata, render_flags); + &metadata, render_use_flags); if (ret) return ret; ret = drv_add_combinations(drv, tileable_texture_source_formats, ARRAY_SIZE(tileable_texture_source_formats), &metadata, - texture_flags); + texture_use_flags); if (ret) return ret; @@ -142,13 +154,13 @@ static int i915_add_combinations(struct driver *drv) metadata.modifier = I915_FORMAT_MOD_Y_TILED; ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), - &metadata, render_flags); + &metadata, render_use_flags); if (ret) return ret; ret = drv_add_combinations(drv, tileable_texture_source_formats, ARRAY_SIZE(tileable_texture_source_formats), &metadata, - texture_flags); + texture_use_flags); if (ret) return ret; @@ -197,6 +209,21 @@ static int i915_align_dimensions(struct bo *bo, uint32_t tiling, uint32_t *strid break; } + /* + * The alignment calculated above is based on the full size luma plane and to have chroma + * planes properly aligned with subsampled formats, we need to multiply luma alignment by + * subsampling factor. + */ + switch (bo->format) { + case DRM_FORMAT_YVU420_ANDROID: + case DRM_FORMAT_YVU420: + horizontal_alignment *= 2; + /* Fall through */ + case DRM_FORMAT_NV12: + vertical_alignment *= 2; + break; + } + *aligned_height = ALIGN(bo->height, vertical_alignment); if (i915->gen > 3) { *stride = ALIGN(*stride, horizontal_alignment); @@ -264,23 +291,20 @@ static int i915_init(struct driver *drv) } static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format, - uint32_t flags) + uint64_t use_flags) { int ret; size_t plane; uint32_t stride; struct drm_i915_gem_create gem_create; struct drm_i915_gem_set_tiling gem_set_tiling; + struct combination *combo; - if (flags & (BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN)) - bo->tiling = I915_TILING_NONE; - else if (flags & BO_USE_SCANOUT) - bo->tiling = I915_TILING_X; - else - bo->tiling = I915_TILING_Y; + combo = drv_get_combination(bo->drv, format, use_flags); + if (!combo) + return -EINVAL; - if (format == DRM_FORMAT_YVU420 || format == DRM_FORMAT_YVU420_ANDROID) - bo->tiling = I915_TILING_NONE; + bo->tiling = combo->metadata.tiling; stride = drv_stride_from_format(format, width, 0); @@ -289,19 +313,42 @@ static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32 return ret; /* - * Align the Y plane to 128 bytes so the chroma planes would be aligned - * to 64 byte boundaries. This is an Intel HW requirement. + * HAL_PIXEL_FORMAT_YV12 requires the buffer height not be aligned, but we need to keep + * total size as with aligned height to ensure enough padding space after each plane to + * satisfy GPU alignment requirements. + * + * We do it by first calling drv_bo_from_format() with aligned height and + * DRM_FORMAT_YVU420, which allows height alignment, saving the total size it calculates + * and then calling it again with requested parameters. + * + * This relies on the fact that i965 driver uses separate surfaces for each plane and + * contents of padding bytes is not affected, as it is only used to satisfy GPU cache + * requests. + * + * This is enforced by Mesa in src/intel/isl/isl_gen8.c, inside + * isl_gen8_choose_image_alignment_el(), which is used for GEN9 and GEN8. */ - if (format == DRM_FORMAT_YVU420) - stride = ALIGN(stride, 128); + if (format == DRM_FORMAT_YVU420_ANDROID) { + uint32_t unaligned_height = bo->height; + size_t total_size; + + drv_bo_from_format(bo, stride, height, DRM_FORMAT_YVU420); + total_size = bo->total_size; + drv_bo_from_format(bo, stride, unaligned_height, format); + bo->total_size = total_size; + } else { + drv_bo_from_format(bo, stride, height, format); + } /* - * HAL_PIXEL_FORMAT_YV12 requires that the buffer's height not be aligned. + * Quoting Mesa ISL library: + * + * - For linear surfaces, additional padding of 64 bytes is required at + * the bottom of the surface. This is in addition to the padding + * required above. */ - if (format == DRM_FORMAT_YVU420_ANDROID) - height = bo->height; - - drv_bo_from_format(bo, stride, height, format); + if (bo->tiling == I915_TILING_NONE) + bo->total_size += 64; memset(&gem_create, 0, sizeof(gem_create)); gem_create.size = bo->total_size; @@ -365,7 +412,7 @@ static int i915_bo_import(struct bo *bo, struct drv_import_fd_data *data) return 0; } -static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane) +static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane, uint32_t map_flags) { int ret; void *addr; @@ -377,6 +424,9 @@ static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane) struct drm_i915_gem_mmap gem_map; memset(&gem_map, 0, sizeof(gem_map)); + if ((bo->use_flags & BO_USE_SCANOUT) && !(bo->use_flags & BO_USE_RENDERSCRIPT)) + gem_map.flags = I915_MMAP_WC; + gem_map.handle = bo->handles[0].u32; gem_map.offset = 0; gem_map.size = bo->total_size; @@ -403,9 +453,8 @@ static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane) return MAP_FAILED; } - addr = mmap(0, bo->total_size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->drv->fd, + addr = mmap(0, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd, gem_map.offset); - set_domain.read_domains = I915_GEM_DOMAIN_GTT; set_domain.write_domain = I915_GEM_DOMAIN_GTT; } @@ -425,22 +474,28 @@ static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane) return addr; } -static int i915_bo_unmap(struct bo *bo, struct map_info *data) +static int i915_bo_flush(struct bo *bo, struct map_info *data) { struct i915_device *i915 = bo->drv->priv; if (!i915->has_llc && bo->tiling == I915_TILING_NONE) i915_clflush(data->addr, data->length); - return munmap(data->addr, data->length); + return 0; } -static uint32_t i915_resolve_format(uint32_t format, uint64_t usage) +static uint32_t i915_resolve_format(uint32_t format, uint64_t use_flags) { switch (format) { case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED: + /* KBL 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: + /* KBL camera subsystem requires NV12. */ + if (use_flags & (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE)) + return DRM_FORMAT_NV12; return DRM_FORMAT_YVU420; default: return format; @@ -455,7 +510,8 @@ struct backend backend_i915 = { .bo_destroy = drv_gem_bo_destroy, .bo_import = i915_bo_import, .bo_map = i915_bo_map, - .bo_unmap = i915_bo_unmap, + .bo_unmap = drv_bo_munmap, + .bo_flush = i915_bo_flush, .resolve_format = i915_resolve_format, };