From: Steve Longerbeam <slongerbeam@gmail.com>
To: linux-media@vger.kernel.org
Cc: Steve Longerbeam <slongerbeam@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v6 10/12] media: imx-csi: Move crop/compose reset after filling default mbus fields
Date: Tue, 8 Jan 2019 16:15:49 -0800 [thread overview]
Message-ID: <20190109001551.16113-11-slongerbeam@gmail.com> (raw)
In-Reply-To: <20190109001551.16113-1-slongerbeam@gmail.com>
If caller passes un-initialized field type V4L2_FIELD_ANY to CSI
sink pad, the reset CSI crop window would not be correct, because
the crop window depends on a valid input field type. To fix move
the reset of crop and compose windows to after the call to
imx_media_fill_default_mbus_fields().
Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/staging/media/imx/imx-media-csi.c | 27 ++++++++++++-----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 47568ec43f4a..7afb7e367d76 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1409,19 +1409,6 @@ static void csi_try_fmt(struct csi_priv *priv,
W_ALIGN, &sdformat->format.height,
MIN_H, MAX_H, H_ALIGN, S_ALIGN);
- /* Reset crop and compose rectangles */
- crop->left = 0;
- crop->top = 0;
- crop->width = sdformat->format.width;
- crop->height = sdformat->format.height;
- if (sdformat->format.field == V4L2_FIELD_ALTERNATE)
- crop->height *= 2;
- csi_try_crop(priv, crop, cfg, &sdformat->format, upstream_ep);
- compose->left = 0;
- compose->top = 0;
- compose->width = crop->width;
- compose->height = crop->height;
-
*cc = imx_media_find_mbus_format(sdformat->format.code,
CS_SEL_ANY, true);
if (!*cc) {
@@ -1437,6 +1424,20 @@ static void csi_try_fmt(struct csi_priv *priv,
imx_media_fill_default_mbus_fields(
&sdformat->format, infmt,
priv->active_output_pad == CSI_SRC_PAD_DIRECT);
+
+ /* Reset crop and compose rectangles */
+ crop->left = 0;
+ crop->top = 0;
+ crop->width = sdformat->format.width;
+ crop->height = sdformat->format.height;
+ if (sdformat->format.field == V4L2_FIELD_ALTERNATE)
+ crop->height *= 2;
+ csi_try_crop(priv, crop, cfg, &sdformat->format, upstream_ep);
+ compose->left = 0;
+ compose->top = 0;
+ compose->width = crop->width;
+ compose->height = crop->height;
+
break;
}
}
--
2.17.1
next prev parent reply other threads:[~2019-01-09 0:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190109001551.16113-1-slongerbeam@gmail.com>
2019-01-09 0:15 ` [PATCH v6 01/12] media: videodev2.h: Add more field helper macros Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 02/12] gpu: ipu-csi: Swap fields according to input/output field types Steve Longerbeam
2019-01-09 11:11 ` Philipp Zabel
2019-01-09 0:15 ` [PATCH v6 03/12] gpu: ipu-v3: Add planar support to interlaced scan Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 04/12] media: imx: Fix field negotiation Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 05/12] media: imx-csi: Input connections to CSI should be optional Steve Longerbeam
2019-01-09 11:13 ` Philipp Zabel
2019-01-09 17:26 ` Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 06/12] media: imx-csi: Double crop height for alternate fields at sink Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 07/12] media: imx: interweave and odd-chroma-row skip are incompatible Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 08/12] media: imx-csi: Allow skipping odd chroma rows for YVU420 Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 09/12] media: imx: vdic: rely on VDIC for correct field order Steve Longerbeam
2019-01-09 0:15 ` Steve Longerbeam [this message]
2019-01-09 0:15 ` [PATCH v6 11/12] media: imx: Allow interweave with top/bottom lines swapped Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 12/12] media: imx.rst: Update doc to reflect fixes to interlaced capture Steve Longerbeam
2019-01-09 11:16 ` Philipp Zabel
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=20190109001551.16113-11-slongerbeam@gmail.com \
--to=slongerbeam@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).