[PATCH 06/16] gpu: ipu-v3: image-convert: calculate tile dimensions and offsets outside fill_image

[Philipp Zabel]

This will allow to calculate seam positions after initializing the
ipu_image base structure but before calculating tile dimensions.

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

diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c 
b/drivers/gpu/ipu-v3/ipu-image-convert.c
index c3358e83bcc1..06d65c63262d 100644
--- a/drivers/gpu/ipu-v3/ipu-image-convert.c
+++ b/drivers/gpu/ipu-v3/ipu-image-convert.c
@@ -1447,9 +1447,6 @@ static int fill_image(struct ipu_image_convert_ctx *ctx,
        else
                ic_image->stride  = ic_image->base.pix.bytesperline;
 
-       calc_tile_dimensions(ctx, ic_image);
-       calc_tile_offsets(ctx, ic_image);
-
        return 0;
 }
 
@@ -1654,10 +1651,6 @@ ipu_image_convert_prepare(struct ipu_soc *ipu, enum 
ipu_ic_task ic_task,
        ctx->num_tiles = d_image->num_cols * d_image->num_rows;
        ctx->rot_mode = rot_mode;
 
-       ret = calc_image_resize_coefficients(ctx, in, out);
-       if (ret)
-               goto out_free;
-
        ret = fill_image(ctx, s_image, in, IMAGE_CONVERT_IN);
        if (ret)
                goto out_free;
@@ -1665,6 +1658,16 @@ ipu_image_convert_prepare(struct ipu_soc *ipu, enum 
ipu_ic_task ic_task,
        if (ret)
                goto out_free;
 
+       ret = calc_image_resize_coefficients(ctx, in, out);
+       if (ret)
+               goto out_free;
+
+       calc_tile_dimensions(ctx, s_image);
+       calc_tile_offsets(ctx, s_image);
+
+       calc_tile_dimensions(ctx, d_image);
+       calc_tile_offsets(ctx, d_image);
+
        calc_out_tile_map(ctx);
        calc_tile_resize_coefficients(ctx);
 
-- 
2.17.1