[PATCH 12/16] gpu: ipu-v3: image-convert: relax output alignment restrictions

[Philipp Zabel]

If we allow different tile sizes, the output tile with / height
alignment doesn't need to be multiplied by number of columns / rows.

Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
 drivers/gpu/ipu-v3/ipu-image-convert.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c 
b/drivers/gpu/ipu-v3/ipu-image-convert.c
index 04113b1c7a92..3eb74d41733f 100644
--- a/drivers/gpu/ipu-v3/ipu-image-convert.c
+++ b/drivers/gpu/ipu-v3/ipu-image-convert.c
@@ -1852,9 +1852,8 @@ void ipu_image_convert_adjust(struct ipu_image *in, 
struct ipu_image *out,
        }
 
        /* align output width/height */
-       w_align = ilog2(tile_width_align(outfmt) * num_out_cols);
-       h_align = ilog2(tile_height_align(IMAGE_CONVERT_OUT, rot_mode) *
-                       num_out_rows);
+       w_align = ilog2(tile_width_align(outfmt));
+       h_align = ilog2(tile_height_align(IMAGE_CONVERT_OUT, rot_mode));
        out->pix.width = clamp_align(out->pix.width, MIN_W, MAX_W, w_align);
        out->pix.height = clamp_align(out->pix.height, MIN_H, MAX_H, h_align);
 
-- 
2.17.1