diff options
| -rw-r--r-- | lib/igt_fb.c | 6 | ||||
| -rw-r--r-- | lib/intel_bufops.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 4d961270..67e63d48 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -670,7 +670,7 @@ static unsigned fb_plane_height(const struct igt_fb *fb, int plane) if (ccs_to_main_plane(fb, plane)) height = DIV_ROUND_UP(height, format->vsub); - return DIV_ROUND_UP(height, 128) * 4; + return DIV_ROUND_UP(height, 32); } else if (is_ccs_plane(fb, plane)) { return DIV_ROUND_UP(fb->height, 512) * 32; } @@ -838,10 +838,6 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane) igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[plane], &tile_width, &tile_height); - /* A main surface using a CCS AUX surface must be 4x4 tiles aligned. */ - if (is_gen12_ccs_modifier(fb->modifier)) - tile_height *= 4; - size = (uint64_t)fb->strides[plane] * ALIGN(fb->plane_height[plane], tile_height); diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c index 80c5bb80..f13063fa 100644 --- a/lib/intel_bufops.c +++ b/lib/intel_bufops.c @@ -771,7 +771,7 @@ static void __intel_buf_init(struct buf_ops *bops, buf->surface[0].stride = ALIGN(width * (bpp / 8), 128); if (bops->intel_gen >= 12) - height = ALIGN(height, 4 * 32); + height = ALIGN(height, 32); buf->surface[0].size = buf->surface[0].stride * height; buf->tiling = tiling; |