[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709...

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

diff --git a/i915.c b/i915.c
index 05c8272..92fd5b1 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -116,7 +116,8 @@ static int i915_add_combinations(struct driver *drv)
        metadata.priority = 3;
        metadata.modifier = I915_FORMAT_MOD_Y_TILED;
 
-       scanout_and_render = unset_flags(scanout_and_render, BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY);
+       scanout_and_render =
+           unset_flags(scanout_and_render, BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY);
 /* Support y-tiled NV12 and P010 for libva */
 #ifdef I915_SCANOUT_Y_TILED
        drv_add_combination(drv, DRM_FORMAT_NV12, &metadata,
@@ -272,7 +273,6 @@ static int i915_bo_compute_metadata(struct bo *bo, uint32_t width, uint32_t heig
                                    uint64_t use_flags, const uint64_t *modifiers, uint32_t count)
 {
        static const uint64_t modifier_order[] = {
-               I915_FORMAT_MOD_Y_TILED_CCS,
                I915_FORMAT_MOD_Y_TILED,
                I915_FORMAT_MOD_X_TILED,
                DRM_FORMAT_MOD_LINEAR,