On 10/14/2016 05:48 PM, Philipp Zabel wrote:
> Am Freitag, den 07.10.2016, 21:01 +0200 schrieb Marek Vasut:
>> On 10/07/2016 06:01 PM, Philipp Zabel wrote:
>>> Add support for the CSI internal horizontal and vertical downsizing.
>>>
>>> Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
>>> ---
>>> 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]);
>>
>> This probably needs fixing , so that the correct VC is passed in ?
>
> Absolutely, right now I don't know how though.
> We are still missing API to set the MIPI CSI-2 virtual channel.
Right. And since most cameras use VC0 anyway, it's unlikely anyone will
be severely affected by this, so this shouldn't be considered a blocker
for this patchset. Maybe add a comment, something along the lines of
"FIXME: We are still missing an API for setting VC != 0" .
--
Best regards,
Marek Vasut
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
