ANDROID: Add target/device support am: 8884508fa6 am: cf0ceff91e am: 96f63775f7

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

diff --git a/i915.c b/i915.c
index 08487ff..92fd5b1 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -96,11 +96,10 @@ static int i915_add_combinations(struct driver *drv)
 
        /*
         * R8 format is used for Android's HAL_PIXEL_FORMAT_BLOB and is used for JPEG snapshots
-        * from camera and input/output from hardware decoder/encoder.
+        * from camera.
         */
        drv_modify_combination(drv, DRM_FORMAT_R8, &metadata,
-                              BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_HW_VIDEO_DECODER |
-                                  BO_USE_HW_VIDEO_ENCODER);
+                              BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE);
 
        render = unset_flags(render, linear_mask);
        scanout_and_render = unset_flags(scanout_and_render, linear_mask);
@@ -279,8 +278,6 @@ static int i915_bo_compute_metadata(struct bo *bo, uint32_t width, uint32_t heig
                DRM_FORMAT_MOD_LINEAR,
        };
        uint64_t modifier;
-       struct i915_device *i915 = bo->drv->priv;
-       bool huge_bo = (i915->gen <= 11) && (width > 4096);
 
        if (modifiers) {
                modifier =
@@ -292,21 +289,6 @@ static int i915_bo_compute_metadata(struct bo *bo, uint32_t width, uint32_t heig
                modifier = combo->metadata.modifier;
        }
 
-       /*
-        * i915 only supports linear/x-tiled above 4096 wide
-        */
-       if (huge_bo && modifier != I915_FORMAT_MOD_X_TILED && modifier != DRM_FORMAT_MOD_LINEAR) {
-               uint32_t i;
-               for (i = 0; modifiers && i < count; i++) {
-                       if (modifiers[i] == I915_FORMAT_MOD_X_TILED)
-                               break;
-               }
-               if (i == count)
-                       modifier = DRM_FORMAT_MOD_LINEAR;
-               else
-                       modifier = I915_FORMAT_MOD_X_TILED;
-       }
-
        switch (modifier) {
        case DRM_FORMAT_MOD_LINEAR:
                bo->meta.tiling = I915_TILING_NONE;