i915: Always set the modifier when allocating BOs
With CL:907756 we now pass modifiers around when export to and
importing from the rest of Chrome and we need to give the right answer
when ozone queries the modifier of a bo allocated with use flags.
Bug: 809670, 809666
Change-Id: Iab5ea62d5e0da9ddd90013f559f802270de1e420
Reviewed-on: https://chromium-review.googlesource.com/907848
Commit-Ready: Kristian H. Kristensen <hoegsberg@chromium.org>
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
diff --git a/i915.c b/i915.c
index c571c22..da22dc5 100644
--- a/i915.c
+++ b/i915.c
@@ -298,6 +298,8 @@
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 @@
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);
}