Revert "Add support to query tiling mode."

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

diff --git a/i915.c b/i915.c
index e3886a6..8f2c6db 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -16,6 +16,7 @@
 #include "drv_priv.h"
 #include "helpers.h"
 #include "util.h"
+#include "i915_private.h"
 
 #define I915_CACHELINE_SIZE 64
 #define I915_CACHELINE_MASK (I915_CACHELINE_SIZE - 1)
@@ -28,13 +29,15 @@ static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMA
 
 static const uint32_t tileable_texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_NV12,
                                                            DRM_FORMAT_R8, DRM_FORMAT_UYVY,
-                                                           DRM_FORMAT_YUYV };
+                                                           DRM_FORMAT_YUYV, DRM_FORMAT_YVYU, DRM_FORMAT_VYUY };
 
 static const uint32_t texture_source_formats[] = { DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID };
 
 struct i915_device {
        uint32_t gen;
        int32_t has_llc;
+       uint64_t cursor_width;
+       uint64_t cursor_height;
 };
 
 static uint32_t i915_get_gen(int device_id)
@@ -63,7 +66,7 @@ static int i915_add_kms_item(struct driver *drv, const struct kms_item *item)
                if (combo->format != item->format)
                        continue;
 
-               if (item->modifier == DRM_FORMAT_MOD_NONE &&
+               if (item->modifier == DRM_FORMAT_MOD_INVALID &&
                    combo->metadata.tiling == I915_TILING_X) {
                        /*
                         * FIXME: drv_query_kms() does not report the available modifiers
@@ -94,7 +97,7 @@ static int i915_add_combinations(struct driver *drv)
 
        metadata.tiling = I915_TILING_NONE;
        metadata.priority = 1;
-       metadata.modifier = DRM_FORMAT_MOD_NONE;
+       metadata.modifier = DRM_FORMAT_MOD_LINEAR;
 
        ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
                                   &metadata, render_use_flags);
@@ -165,6 +168,8 @@ static int i915_add_combinations(struct driver *drv)
        if (ret)
                return ret;
 
+       i915_private_add_combinations(drv);
+
        items = drv_query_kms(drv, &num_items);
        if (!items || !num_items)
                return 0;
@@ -204,8 +209,8 @@ static int i915_align_dimensions(struct bo *bo, uint32_t tiling, uint32_t *strid
                        horizontal_alignment = 512;
                        vertical_alignment = 8;
                } else {
-                       horizontal_alignment = 128;
-                       vertical_alignment = 32;
+                       horizontal_alignment = 128;
+                       vertical_alignment = 32;
                }
                break;
        }
@@ -225,6 +230,8 @@ static int i915_align_dimensions(struct bo *bo, uint32_t tiling, uint32_t *strid
                break;
        }
 
+       i915_private_align_dimensions(bo->format, &vertical_alignment);
+
        *aligned_height = ALIGN(bo->height, vertical_alignment);
        if (i915->gen > 3) {
                *stride = ALIGN(*stride, horizontal_alignment);
@@ -288,30 +295,48 @@ static int i915_init(struct driver *drv)
 
        drv->priv = i915;
 
+       i915_private_init(drv, &i915->cursor_width, &i915->cursor_height);
+
        return i915_add_combinations(drv);
 }
 
-static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                         uint64_t use_flags)
+static int i915_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t height,
+                                      uint32_t format, uint64_t modifier)
 {
        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;
-
-       combo = drv_get_combination(bo->drv, format, use_flags);
-       if (!combo)
-               return -EINVAL;
+       struct i915_device *i915_dev = (struct i915_device *)bo->drv->priv;
 
-       bo->tiling = combo->metadata.tiling;
+       switch (modifier) {
+       case DRM_FORMAT_MOD_LINEAR:
+               bo->tiling = I915_TILING_NONE;
+               break;
+       case I915_FORMAT_MOD_X_TILED:
+               bo->tiling = I915_TILING_X;
+               break;
+       case I915_FORMAT_MOD_Y_TILED:
+               bo->tiling = I915_TILING_Y;
+               break;
+       }
 
        stride = drv_stride_from_format(format, width, 0);
 
-       ret = i915_align_dimensions(bo, bo->tiling, &stride, &height);
-       if (ret)
-               return ret;
+        /*
+         * Align cursor width and height to values expected by Intel
+         * HW.
+         */
+       if (bo->use_flags & BO_USE_CURSOR) {
+            width = ALIGN(width, i915_dev->cursor_width);
+            height = ALIGN(height, i915_dev->cursor_height);
+            stride = drv_stride_from_format(format, width, 0);
+        } else {
+            ret = i915_align_dimensions(bo, bo->tiling, &stride, &height);
+            if (ret)
+                return ret;
+        }
 
        /*
         * HAL_PIXEL_FORMAT_YV12 requires the buffer height not be aligned, but we need to keep
@@ -351,6 +376,12 @@ static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32
        if (bo->tiling == I915_TILING_NONE)
                bo->total_size += 64;
 
+        /*
+         * Ensure we pass aligned width/height.
+         */
+        bo->width = width;
+        bo->height = height;
+
        memset(&gem_create, 0, sizeof(gem_create));
        gem_create.size = bo->total_size;
 
@@ -383,6 +414,33 @@ static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32
        return 0;
 }
 
+static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+                         uint64_t use_flags)
+{
+       struct combination *combo;
+
+       combo = drv_get_combination(bo->drv, format, use_flags);
+       if (!combo)
+               return -EINVAL;
+
+       return i915_bo_create_for_modifier(bo, width, height, format, combo->metadata.modifier);
+}
+
+static int i915_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t height,
+                                        uint32_t format, const uint64_t *modifiers, uint32_t count)
+{
+       static const uint64_t modifier_order[] = {
+               I915_FORMAT_MOD_Y_TILED, I915_FORMAT_MOD_X_TILED, DRM_FORMAT_MOD_LINEAR,
+       };
+       uint64_t modifier;
+
+       modifier = drv_pick_modifier(modifiers, count, modifier_order, ARRAY_SIZE(modifier_order));
+
+       bo->format_modifiers[0] = modifier;
+
+       return i915_bo_create_for_modifier(bo, width, height, format, modifier);
+}
+
 static void i915_close(struct driver *drv)
 {
        free(drv->priv);
@@ -498,6 +556,11 @@ static int i915_bo_flush(struct bo *bo, struct map_info *data)
 
 static uint32_t i915_resolve_format(uint32_t format, uint64_t use_flags)
 {
+       uint32_t resolved_format;
+       if (i915_private_resolve_format(format, use_flags, &resolved_format)) {
+           return resolved_format;
+       }
+
        switch (format) {
        case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
                /* KBL camera subsystem requires NV12. */
@@ -520,6 +583,7 @@ struct backend backend_i915 = {
        .init = i915_init,
        .close = i915_close,
        .bo_create = i915_bo_create,
+       .bo_create_with_modifiers = i915_bo_create_with_modifiers,
        .bo_destroy = drv_gem_bo_destroy,
        .bo_import = i915_bo_import,
        .bo_map = i915_bo_map,