diff options
| author | Ilja Friedel <ihf@chromium.org> | 2022-02-07 23:13:59 +0000 |
|---|---|---|
| committer | Miguel Casas <mcasas@google.com> | 2022-02-07 23:16:36 +0000 |
| commit | 044c6b8b90780448579291515acd701d28de3119 (patch) | |
| tree | e1d2ab28fd1cfff060bccfc33a5adc7d38c64292 | |
| parent | 17fa1a8ab6745ace4ddae90fd6255f212146fd0d (diff) | |
| download | minigbm-044c6b8b90780448579291515acd701d28de3119.tar.gz | |
Revert "i915/gen12: Fix plane offset for Y-tiling"
This reverts commit daa7273ded19dcb5f9dcae98fc04ffa1410fad7a.
Reason for revert: the lack of reverting both changes at the same time causes video.ChromeStackDecoding to fail on volteer et al.
BUG=b:218381300, b:210276702
Original change's description:
> i915/gen12: Fix plane offset for Y-tiling
>
> BUG=b:210276702
> TEST=android.graphics.cts.MediaVulkanGpuTest
>
> Change-Id: I66dc6baacf2eb8487d535c544d8bfd9225b8592e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3421573
> Tested-by: Chad Versace <chadversary@chromium.org>
> Auto-Submit: Chad Versace <chadversary@chromium.org>
> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
> Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
Bug: b:210276702
Change-Id: I8c688de6bdad7db489af7469fc47bf0667cd90dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3445142
Tested-by: Ilja Friedel <ihf@chromium.org>
Auto-Submit: Ilja Friedel <ihf@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Miguel Casas-Sanchez <mcasas@chromium.org>
| -rw-r--r-- | i915.c | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -422,15 +422,6 @@ static int i915_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, u plane_height = ALIGN(plane_height, 64); } - if (i915->gen >= 12 && bo->meta.tiling == I915_TILING_Y) { - /* When Y-tiled with CCS, the hardware requires offset alignment 64K. When - * Y-tiled without CCS, the hardware requires 4K, as usual for a Y tile. - * Mesa requires 64K either way, because Mesa wants to privately enable CCS - * even when using I915_FORMAT_MOD_Y_TILED. - */ - offset = ALIGN(offset, 64 * 1024); - } - bo->meta.strides[plane] = stride; bo->meta.sizes[plane] = stride * plane_height; bo->meta.offsets[plane] = offset; |