Linux Media Controller development
 help / color / mirror / Atom feed
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
To: LMML <linux-media@vger.kernel.org>
Cc: s.nawrocki@samsung.com
Subject: [PATCH 4/5] s5p-fimc: Iterate for each memory plane
Date: Tue, 25 Mar 2014 16:52:31 -0400	[thread overview]
Message-ID: <1395780751.11851.19.camel@nicolas-tpx230> (raw)
In-Reply-To: <1395780301.11851.14.camel@nicolas-tpx230>

[-- Attachment #1: Type: text/plain, Size: 1934 bytes --]

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 <nicolas.dufresne@collabora.com>
---
 drivers/media/platform/exynos4-is/fimc-core.c | 2 +-
 drivers/media/platform/exynos4-is/fimc-m2m.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
index 0e94412..ab9450b 100644
--- 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 36971d9..07b8f97 100644
--- a/drivers/media/platform/exynos4-is/fimc-m2m.c
+++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
@@ -342,7 +342,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;
 	}
@@ -461,7 +461,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,
-- 
1.8.5.3



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

  parent reply	other threads:[~2014-03-25 20:52 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-25 20:45 [PATCH 0/5] s5p-fimc: Misc fixes Nicolas Dufresne
2014-03-25 20:50 ` [PATCH 2/5] s5p-fimc: Fix YUV422P depth Nicolas Dufresne
2014-03-25 20:51 ` [PATCH 3/5] s5p-fimc: Align imagesize to row size for tiled formats Nicolas Dufresne
2014-03-26 22:38   ` Nicolas Dufresne
2014-03-26 22:48     ` [PATCH 3/5] s5p-fimc: Roundup " Nicolas Dufresne
2014-03-25 20:52 ` Nicolas Dufresne [this message]
2014-03-25 20:53 ` [PATCH 5/5] s5p-fimc: Reuse calculated sizes Nicolas Dufresne
2014-03-25 20:55 ` [PATCH 1/5] s5p-fimc: Changed RGB32 to BGR32 Nicolas Dufresne
2014-04-01 14:34   ` Sylwester Nawrocki
2014-04-01 15:16     ` Nicolas Dufresne
2014-03-25 20:56 ` [PATCH 2/5] s5p-fimc: Fix YUV422P depth Nicolas Dufresne
2014-04-01 14:13 ` [PATCH 0/5] s5p-fimc: Misc fixes Nicolas Dufresne
2014-04-01 14:28   ` Sylwester Nawrocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1395780751.11851.19.camel@nicolas-tpx230 \
    --to=nicolas.dufresne@collabora.com \
    --cc=linux-media@vger.kernel.org \
    --cc=s.nawrocki@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox