From: Philipp Zabel <p.zabel@pengutronix.de>
To: linux-media@vger.kernel.org
Cc: Steve Longerbeam <steve_longerbeam@mentor.com>,
Marek Vasut <marex@denx.de>, Hans Verkuil <hverkuil@xs4all.nl>,
kernel@pengutronix.de, Philipp Zabel <p.zabel@pengutronix.de>
Subject: [PATCH 18/22] [media] imx-ipuv3-csi: support downsizing
Date: Fri, 7 Oct 2016 18:01:03 +0200 [thread overview]
Message-ID: <20161007160107.5074-19-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20161007160107.5074-1-p.zabel@pengutronix.de>
Add support for the CSI internal horizontal and vertical downsizing.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/media/platform/imx/imx-ipuv3-csi.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/imx/imx-ipuv3-csi.c b/drivers/media/platform/imx/imx-ipuv3-csi.c
index 699460e6..e8a6a7b 100644
--- a/drivers/media/platform/imx/imx-ipuv3-csi.c
+++ b/drivers/media/platform/imx/imx-ipuv3-csi.c
@@ -167,8 +167,16 @@ static int ipucsi_subdev_set_format(struct v4l2_subdev *sd,
width = clamp_t(unsigned int, sdformat->format.width, 16, 8192);
height = clamp_t(unsigned int, sdformat->format.height, 16, 4096);
} else {
- width = ipucsi->format_mbus[0].width;
- height = ipucsi->format_mbus[0].height;
+ if (sdformat->format.width <
+ (ipucsi->format_mbus[0].width * 3 / 4))
+ width = ipucsi->format_mbus[0].width / 2;
+ else
+ width = ipucsi->format_mbus[0].width;
+ if (sdformat->format.height <
+ (ipucsi->format_mbus[0].height * 3 / 4))
+ height = ipucsi->format_mbus[0].height / 2;
+ else
+ height = ipucsi->format_mbus[0].height;
}
mbusformat = __ipucsi_get_pad_format(sd, cfg, sdformat->pad,
@@ -212,14 +220,14 @@ static int ipucsi_subdev_s_stream(struct v4l2_subdev *sd, int enable)
window.width = fmt[0].width;
window.height = fmt[0].height;
ipu_csi_set_window(ipucsi->csi, &window);
+ ipu_csi_set_downsize(ipucsi->csi,
+ fmt[0].width == 2 * fmt[1].width,
+ fmt[0].height == 2 * fmt[1].height);
/* Is CSI data source MCT (MIPI)? */
mux_mct = (mbus_config.type == V4L2_MBUS_CSI2);
-
ipu_set_csi_src_mux(ipucsi->ipu, ipucsi->id, mux_mct);
- if (mux_mct)
- ipu_csi_set_mipi_datatype(ipucsi->csi, /*VC*/ 0,
- &fmt[0]);
+ ipu_csi_set_mipi_datatype(ipucsi->csi, /*VC*/ 0, &fmt[0]);
ret = ipu_csi_init_interface(ipucsi->csi, &mbus_config,
&fmt[0]);
--
2.9.3
next prev parent reply other threads:[~2016-10-07 16:01 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 16:00 [PATCH 00/22] Basic i.MX IPUv3 capture support Philipp Zabel
2016-10-07 16:00 ` [PATCH 01/22] [media] v4l2-async: move code out of v4l2_async_notifier_register into v4l2_async_test_nofity_all Philipp Zabel
2016-10-07 16:30 ` Marek Vasut
2016-10-07 16:53 ` Philipp Zabel
2016-10-07 16:00 ` [PATCH 02/22] [media] v4l2-async: allow subdevices to add further subdevices to the notifier waiting list Philipp Zabel
2016-10-07 21:52 ` Sakari Ailus
2016-10-12 13:26 ` Philipp Zabel
2016-10-13 11:56 ` Sakari Ailus
2016-10-14 15:47 ` Philipp Zabel
2016-10-07 22:43 ` Sakari Ailus
2016-10-14 15:48 ` Philipp Zabel
2016-10-14 17:06 ` Ian Arkver
2016-10-14 17:30 ` Philipp Zabel
2016-10-07 16:00 ` [PATCH 03/22] [media] v4l: of: add v4l2_of_subdev_registered Philipp Zabel
2016-10-07 18:50 ` Marek Vasut
2016-10-14 15:48 ` Philipp Zabel
2016-10-07 22:50 ` Sakari Ailus
2016-10-14 15:49 ` Philipp Zabel
2016-10-07 16:00 ` [PATCH 04/22] [media] v4l2-subdev.h: add prepare_stream op Philipp Zabel
2016-10-07 23:16 ` Sakari Ailus
2016-10-14 15:48 ` Philipp Zabel
2016-10-16 22:59 ` Sakari Ailus
2016-10-07 16:00 ` [PATCH 05/22] [media] v4l2-async: add new subdevices to the tail of subdev_list Philipp Zabel
2016-10-07 16:00 ` [PATCH 06/22] [media] imx: Add i.MX SoC wide media device driver Philipp Zabel
2016-10-07 16:00 ` [PATCH 07/22] [media] imx: Add IPUv3 media common code Philipp Zabel
2016-10-17 7:04 ` Ian Arkver
2016-10-07 16:00 ` [PATCH 08/22] [media] imx-ipu: Add i.MX IPUv3 CSI subdevice driver Philipp Zabel
2016-10-07 16:00 ` [PATCH 09/22] [media] imx: Add i.MX IPUv3 capture driver Philipp Zabel
2016-10-07 16:00 ` [PATCH 10/22] [media] platform: add video-multiplexer subdevice driver Philipp Zabel
2016-10-07 16:00 ` [PATCH 11/22] [media] imx: Add i.MX MIPI CSI-2 " Philipp Zabel
2016-10-07 16:00 ` [PATCH 12/22] [media] tc358743: put lanes in STOP state before starting streaming Philipp Zabel
2016-10-07 19:02 ` Marek Vasut
2016-10-14 15:49 ` Philipp Zabel
2016-10-07 16:00 ` [PATCH 13/22] ARM: dts: imx6qdl: Add capture-subsystem node Philipp Zabel
2016-10-07 16:00 ` [PATCH 14/22] ARM: dts: imx6qdl: Add mipi_ipu1/2 multiplexers, mipi_csi, and their connections Philipp Zabel
2016-10-07 16:01 ` [PATCH 15/22] ARM: dts: imx6qdl: Add MIPI CSI-2 D-PHY compatible and clocks Philipp Zabel
2016-10-07 16:01 ` [PATCH 16/22] ARM: dts: nitrogen6x: Add dtsi for BD_HDMI_MIPI HDMI to MIPI CSI-2 receiver board Philipp Zabel
2016-10-10 15:48 ` [16/22] " Gary Bisson
2016-10-14 16:45 ` Philipp Zabel
2016-10-07 16:01 ` [PATCH 17/22] gpu: ipuv3: add ipu_csi_set_downsize Philipp Zabel
2016-10-07 16:01 ` Philipp Zabel [this message]
2016-10-07 19:01 ` [PATCH 18/22] [media] imx-ipuv3-csi: support downsizing Marek Vasut
2016-10-14 15:48 ` Philipp Zabel
2016-10-16 15:09 ` Marek Vasut
2016-10-07 16:01 ` [PATCH 19/22] [media] add mux and video interface bridge entity functions Philipp Zabel
2016-10-07 16:01 ` [PATCH 20/22] [media] video-multiplexer: set entity function to mux Philipp Zabel
2016-10-07 16:01 ` [PATCH 21/22] [media] imx: Set i.MX MIPI CSI-2 entity function to bridge Philipp Zabel
2016-10-07 16:01 ` [PATCH 22/22] [media] tc358743: set entity function to video interface bridge 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=20161007160107.5074-19-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=hverkuil@xs4all.nl \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=marex@denx.de \
--cc=steve_longerbeam@mentor.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