[media] s5p-fimc: Iterate for each memory plane

Depth and payload is defined per memory plane. It's better to iterate using
number of memory planes. This was not causing much issue since the rest
of the arrays involved where intialized to zero.

Signed-off-by: Nicolas Dufresne <[email protected]>
Signed-off-by: Sylwester Nawrocki <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
index 25dbf5b05a96186527cf520f568f03721b181a80..53f12ac069d45bbfd9e7fca2d18bcdf5109b284c 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -450,7 +450,7 @@ void fimc_prepare_dma_offset(struct fimc_ctx *ctx, struct fimc_frame *f)
        bool pix_hoff = ctx->fimc_dev->drv_data->dma_pix_hoff;
        u32 i, depth = 0;
 
-       for (i = 0; i < f->fmt->colplanes; i++)
+       for (i = 0; i < f->fmt->memplanes; i++)
                depth += f->fmt->depth[i];
 
        f->dma_offset.y_h = f->offs_h;

diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c
index d314155da9e4afed19bae48ac6e2e8a9e58e082f..417a6781e93f25ae5e7abddc24465da85f2d74a9 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-m2m.c
+++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
@@ -341,7 +341,7 @@ static void __set_frame_format(struct fimc_frame *frame, struct fimc_fmt *fmt,
 {
        int i;
 
-       for (i = 0; i < fmt->colplanes; i++) {
+       for (i = 0; i < fmt->memplanes; i++) {
                frame->bytesperline[i] = pixm->plane_fmt[i].bytesperline;
                frame->payload[i] = pixm->plane_fmt[i].sizeimage;
        }
@@ -460,7 +460,7 @@ static int fimc_m2m_try_crop(struct fimc_ctx *ctx, struct v4l2_crop *cr)
        else
                halign = ffs(fimc->variant->min_vsize_align) - 1;
 
-       for (i = 0; i < f->fmt->colplanes; i++)
+       for (i = 0; i < f->fmt->memplanes; i++)
                depth += f->fmt->depth[i];
 
        v4l_bound_align_image(&cr->c.width, min_size, f->o_width,