summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2021-04-29 22:26:28 +0300
committerImre Deak <imre.deak@intel.com>2021-05-05 16:20:23 +0300
commitabb2383a222962b89738127b30036ee089b172d5 (patch)
treeb472ec6870d0a36ee83778f64b3d1a4a570eb103
parent575436a6a3998b18f0f6e239664f25ae42b54438 (diff)
lib/igt_fb: Remove redundant VC4 SAND plane size alignment
Special casing the tile_height > plane_height by rounding up the plane_height to tile_height is redundant, since in that case the following return statement will do exactly the same. Remove the special casing. The only exception would be if plane_height was 0, but the commit adding the special case doesn't mention this as a possiblity and I presume that as an framebuffer configuration. Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Cc: Lyude Paul <lyude@redhat.com> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Juha-Pekka Heikkilä <juha-pekka.heikkila@intel.com>
-rw-r--r--lib/igt_fb.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 209bfacf0..f8f02766e 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -801,13 +801,6 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane)
if (is_gen12_ccs_modifier(fb->modifier))
tile_height *= 4;
- /* Special case where the "tile height" represents a
- * height-based stride, such as with VC4 SAND tiling modes.
- */
-
- if (tile_height > fb->plane_height[plane])
- return fb->strides[plane] * tile_height;
-
return (uint64_t) fb->strides[plane] *
ALIGN(fb->plane_height[plane], tile_height);
}