minigbm: cros_gralloc: support GRALLOC_MODULE_API_VERSION_0_3

[android-x86/external-minigbm.git] / i915.c

diff --git a/i915.c b/i915.c
index 37a96fe..c8cd1d5 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -59,17 +59,22 @@ static int i915_add_kms_item(struct driver *drv, const struct kms_item *item)
         */
        for (i = 0; i < drv->backend->combos.size; i++) {
                combo = &drv->backend->combos.data[i];
-               if (combo->format == item->format) {
-                       if ((combo->metadata.tiling == I915_TILING_Y &&
-                            item->modifier == I915_FORMAT_MOD_Y_TILED) ||
-                           (combo->metadata.tiling == I915_TILING_X &&
-                            item->modifier == I915_FORMAT_MOD_X_TILED)) {
-                               combo->metadata.modifier = item->modifier;
-                               combo->usage |= item->usage;
-                       } else if (combo->metadata.tiling != I915_TILING_Y) {
-                               combo->usage |= item->usage;
-                       }
+               if (combo->format != item->format)
+                       continue;
+
+               if (item->modifier == DRM_FORMAT_MOD_NONE &&
+                   combo->metadata.tiling == I915_TILING_X) {
+                       /*
+                        * FIXME: drv_query_kms() does not report the available modifiers
+                        * yet, but we know that all hardware can scanout from X-tiled
+                        * buffers, so let's add this to our combinations, except for
+                        * cursor, which must not be tiled.
+                        */
+                       combo->usage |= item->usage & ~BO_USE_CURSOR;
                }
+
+               if (combo->metadata.modifier == item->modifier)
+                       combo->usage |= item->usage;
        }
 
        return 0;
@@ -109,6 +114,16 @@ static int i915_add_combinations(struct driver *drv)
        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);
 
+       /* 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);
+
        render_flags &= ~BO_USE_SW_WRITE_OFTEN;
        render_flags &= ~BO_USE_SW_READ_OFTEN;
        render_flags &= ~BO_USE_LINEAR;
@@ -119,6 +134,7 @@ static int i915_add_combinations(struct driver *drv)
 
        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);
@@ -133,6 +149,7 @@ static int i915_add_combinations(struct driver *drv)
 
        metadata.tiling = I915_TILING_Y;
        metadata.priority = 3;
+       metadata.modifier = I915_FORMAT_MOD_Y_TILED;
 
        ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
                                   &metadata, render_flags);
@@ -264,16 +281,13 @@ static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32
        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, 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);
 
@@ -296,6 +310,16 @@ static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32
 
        drv_bo_from_format(bo, stride, height, format);
 
+       /*
+        * 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 (bo->tiling == I915_TILING_NONE)
+               bo->total_size += 64;
+
        memset(&gem_create, 0, sizeof(gem_create));
        gem_create.size = bo->total_size;
 
@@ -358,7 +382,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, int prot)
 {
        int ret;
        void *addr;
@@ -396,9 +420,7 @@ 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,
-                           gem_map.offset);
-
+               addr = mmap(0, bo->total_size, prot, MAP_SHARED, bo->drv->fd, gem_map.offset);
                set_domain.read_domains = I915_GEM_DOMAIN_GTT;
                set_domain.write_domain = I915_GEM_DOMAIN_GTT;
        }
@@ -427,13 +449,19 @@ static int i915_bo_unmap(struct bo *bo, struct map_info *data)
        return munmap(data->addr, data->length);
 }
 
-static uint32_t i915_resolve_format(uint32_t format)
+static uint32_t i915_resolve_format(uint32_t format, uint64_t usage)
 {
        switch (format) {
        case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
+               /* KBL 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:
+               /* KBL camera subsystem requires NV12. */
+               if (usage & (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE))
+                       return DRM_FORMAT_NV12;
                return DRM_FORMAT_YVU420;
        default:
                return format;