Commit 8411323f authored by Nicolas Dufresne's avatar Nicolas Dufresne Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ec77581a

drivers/media/platform/exynos4-is/fimc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/exynos4-is/fimc-m2m.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE