Fix minigbm against older kernel DRM versions.

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

diff --git a/i915.c b/i915.c
index d4f2ece..da22dc5 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -26,11 +26,11 @@ static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888,    DRM_FO
                                                  DRM_FORMAT_XRGB1555,    DRM_FORMAT_XRGB2101010,
                                                  DRM_FORMAT_XRGB8888 };
 
-static const uint32_t tileable_texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_NV12,
-                                                           DRM_FORMAT_R8, DRM_FORMAT_UYVY,
-                                                           DRM_FORMAT_YUYV };
+static const uint32_t tileable_texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_R8,
+                                                           DRM_FORMAT_UYVY, DRM_FORMAT_YUYV };
 
-static const uint32_t texture_source_formats[] = { DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID };
+static const uint32_t texture_source_formats[] = { DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID,
+                                                  DRM_FORMAT_NV12 };
 
 struct i915_device {
        uint32_t gen;
@@ -58,12 +58,12 @@ 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->combos.size; i++) {
-               combo = &drv->combos.data[i];
+       for (i = 0; i < drv_array_size(drv->combos); i++) {
+               combo = (struct combination *)drv_array_at_idx(drv->combos, i);
                if (combo->format != item->format)
                        continue;
 
-               if (item->modifier == DRM_FORMAT_MOD_INVALID &&
+               if (item->modifier == DRM_FORMAT_MOD_LINEAR &&
                    combo->metadata.tiling == I915_TILING_X) {
                        /*
                         * FIXME: drv_query_kms() does not report the available modifiers
@@ -84,8 +84,8 @@ static int i915_add_kms_item(struct driver *drv, const struct kms_item *item)
 static int i915_add_combinations(struct driver *drv)
 {
        int ret;
-       uint32_t i, num_items;
-       struct kms_item *items;
+       uint32_t i;
+       struct drv_array *kms_items;
        struct format_metadata metadata;
        uint64_t render_use_flags, texture_use_flags;
 
@@ -151,19 +151,19 @@ static int i915_add_combinations(struct driver *drv)
                             ARRAY_SIZE(tileable_texture_source_formats), &metadata,
                             texture_use_flags);
 
-       items = drv_query_kms(drv, &num_items);
-       if (!items || !num_items)
+       kms_items = drv_query_kms(drv);
+       if (!kms_items)
                return 0;
 
-       for (i = 0; i < num_items; i++) {
-               ret = i915_add_kms_item(drv, &items[i]);
+       for (i = 0; i < drv_array_size(kms_items); i++) {
+               ret = i915_add_kms_item(drv, (struct kms_item *)drv_array_at_idx(kms_items, i));
                if (ret) {
-                       free(items);
+                       drv_array_destroy(kms_items);
                        return ret;
                }
        }
 
-       free(items);
+       drv_array_destroy(kms_items);
        return 0;
 }
 
@@ -298,6 +298,8 @@ static int i915_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t h
                break;
        }
 
+       bo->format_modifiers[0] = modifier;
+
        stride = drv_stride_from_format(format, width, 0);
 
        ret = i915_align_dimensions(bo, bo->tiling, &stride, &height);
@@ -398,8 +400,6 @@ static int i915_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t
 
        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);
 }
 
@@ -526,10 +526,16 @@ static uint32_t i915_resolve_format(uint32_t format, uint64_t use_flags)
                /*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;
+               /*
+                * KBL camera subsystem requires NV12. Our other use cases
+                * don't care:
+                * - Hardware video supports NV12,
+                * - USB Camera HALv3 supports NV12,
+                * - USB Camera HALv1 doesn't use this format.
+                * Moreover, NV12 is preferred for video, due to overlay
+                * support on SKL+.
+                */
+               return DRM_FORMAT_NV12;
        default:
                return format;
        }