diff options
| author | Yiwei Zhang <zzyiwei@chromium.org> | 2022-02-04 00:39:06 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-04 22:56:53 +0000 |
| commit | 17fa1a8ab6745ace4ddae90fd6255f212146fd0d (patch) | |
| tree | 7c23697205771a00142daa367c9ece5e94e90191 | |
| parent | daa7273ded19dcb5f9dcae98fc04ffa1410fad7a (diff) | |
| download | minigbm-17fa1a8ab6745ace4ddae90fd6255f212146fd0d.tar.gz | |
Revert "i915/gen12: Fix row stride for Y-tiling"
This reverts commit 0f9bd7271890684262229a56e11d25c1785993ac.
Reason for revert: graphics.VAAPIUnittest.common fails on brya/volteer
Original change's description:
> i915/gen12: Fix row stride for Y-tiling
>
> The diff looks weird because I needed to re-arrange the if-blocks to
> preserve the gen sort order.
>
> BUG=b:210276702
> TEST=android.graphics.cts.MediaVulkanGpuTest
>
> Change-Id: Iab8222db132c6b05bc9cbfc738f04269c95c4442
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3404962
> 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, b:217326369
Change-Id: I175d1ea8ed8f7573c5a137fc426b38a454defe9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3437778
Reviewed-by: Junichi Uekawa <uekawa@chromium.org>
Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
Auto-Submit: Yiwei Zhang <zzyiwei@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Raul Rangel <rrangel@chromium.org>
| -rw-r--r-- | i915.c | 15 |
1 files changed, 3 insertions, 12 deletions
@@ -297,21 +297,12 @@ static int i915_align_dimensions(struct bo *bo, uint32_t tiling, uint32_t *strid break; case I915_TILING_Y: - if (i915->gen >= 12) { - /* When Y-tiled with CCS, the hardware requires halign 512B. When Y-tiled - * without CCS, the hardware requires halign 128B, as usual for a Y tile. - * Mesa requires halign 512B either way, because Mesa wants to privately - * enable CCS even when using I915_FORMAT_MOD_Y_TILED. - */ + if (i915->gen == 3) { horizontal_alignment = 512; - vertical_alignment = 32; - } else if (i915->gen >= 4) { - /* With or without CCS, the hardware requires halign 128B. */ + vertical_alignment = 8; + } else { horizontal_alignment = 128; vertical_alignment = 32; - } else { /* gen3 */ - horizontal_alignment = 512; - vertical_alignment = 8; } break; } |