minigbm: remove cirrus driver

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

diff --git a/i915.c b/i915.c
index 70ecc5a..5869a59 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -20,9 +20,10 @@
 #define I915_CACHELINE_SIZE 64
 #define I915_CACHELINE_MASK (I915_CACHELINE_SIZE - 1)
 
-static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB1555, DRM_FORMAT_ABGR8888,
-                                                 DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565,
-                                                 DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB1555,
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888,    DRM_FORMAT_ARGB1555,
+                                                 DRM_FORMAT_ARGB8888,    DRM_FORMAT_RGB565,
+                                                 DRM_FORMAT_XBGR2101010, DRM_FORMAT_XBGR8888,
+                                                 DRM_FORMAT_XRGB1555,    DRM_FORMAT_XRGB2101010,
                                                  DRM_FORMAT_XRGB8888 };
 
 static const uint32_t tileable_texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_NV12,
@@ -62,7 +63,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
@@ -93,7 +94,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);
@@ -290,21 +291,26 @@ static int i915_init(struct driver *drv)
        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;
 
-       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);
 
@@ -382,6 +388,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);
@@ -416,10 +449,7 @@ static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane, uin
 {
        int ret;
        void *addr;
-       struct drm_i915_gem_set_domain set_domain;
 
-       memset(&set_domain, 0, sizeof(set_domain));
-       set_domain.handle = bo->handles[0].u32;
        if (bo->tiling == I915_TILING_NONE) {
                struct drm_i915_gem_mmap gem_map;
                memset(&gem_map, 0, sizeof(gem_map));
@@ -438,9 +468,6 @@ static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane, uin
                }
 
                addr = (void *)(uintptr_t)gem_map.addr_ptr;
-               set_domain.read_domains = I915_GEM_DOMAIN_CPU;
-               set_domain.write_domain = I915_GEM_DOMAIN_CPU;
-
        } else {
                struct drm_i915_gem_mmap_gtt gem_map;
                memset(&gem_map, 0, sizeof(gem_map));
@@ -455,8 +482,6 @@ static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane, uin
 
                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;
        }
 
        if (addr == MAP_FAILED) {
@@ -464,14 +489,34 @@ static void *i915_bo_map(struct bo *bo, struct map_info *data, size_t plane, uin
                return addr;
        }
 
+       data->length = bo->total_size;
+       return addr;
+}
+
+static int i915_bo_invalidate(struct bo *bo, struct map_info *data)
+{
+       int ret;
+       struct drm_i915_gem_set_domain set_domain;
+
+       memset(&set_domain, 0, sizeof(set_domain));
+       set_domain.handle = bo->handles[0].u32;
+       if (bo->tiling == I915_TILING_NONE) {
+               set_domain.read_domains = I915_GEM_DOMAIN_CPU;
+               if (data->map_flags & BO_MAP_WRITE)
+                       set_domain.write_domain = I915_GEM_DOMAIN_CPU;
+       } else {
+               set_domain.read_domains = I915_GEM_DOMAIN_GTT;
+               if (data->map_flags & BO_MAP_WRITE)
+                       set_domain.write_domain = I915_GEM_DOMAIN_GTT;
+       }
+
        ret = drmIoctl(bo->drv->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
        if (ret) {
-               fprintf(stderr, "drv: DRM_IOCTL_I915_GEM_SET_DOMAIN failed\n");
-               return MAP_FAILED;
+               fprintf(stderr, "drv: DRM_IOCTL_I915_GEM_SET_DOMAIN with %d\n", ret);
+               return ret;
        }
 
-       data->length = bo->total_size;
-       return addr;
+       return 0;
 }
 
 static int i915_bo_flush(struct bo *bo, struct map_info *data)
@@ -507,10 +552,12 @@ 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,
        .bo_unmap = drv_bo_munmap,
+       .bo_invalidate = i915_bo_invalidate,
        .bo_flush = i915_bo_flush,
        .resolve_format = i915_resolve_format,
 };