bpp * width must align to 8. Use media_bus_fmt_to_csi2_bpp() and
v4l_get_required_align_by_bpp() to get width's alignment requirement.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
drivers/media/platform/synopsys/mipi-csi2.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/media/platform/synopsys/mipi-csi2.c b/drivers/media/platform/synopsys/mipi-csi2.c
index e628cc67046b05bf0178c002a8bdf4bbcd64b30e..5435b58de55d21aa957fc635c950ba2ae25a8dcc 100644
--- a/drivers/media/platform/synopsys/mipi-csi2.c
+++ b/drivers/media/platform/synopsys/mipi-csi2.c
@@ -11,6 +11,7 @@
#include <linux/io.h>
#include <linux/iopoll.h>
#include <linux/irq.h>
+#include <linux/limits.h>
#include <linux/module.h>
#include <linux/of_graph.h>
#include <linux/platform_device.h>
@@ -664,15 +665,31 @@ static int csi2_set_fmt(struct v4l2_subdev *sd,
{
struct dw_mipi_csi2_dev *csi2 = sd_to_dev(sd);
struct v4l2_mbus_framefmt *fmt;
+ u32 align;
+ u32 bpp;
if (sdformat->pad >= (csi2->num_src_pads + csi2->num_sink_pads))
return -EINVAL;
+ /*
+ * The CSIS can't transcode in any way, the source format can't be
+ * modified.
+ */
+ if (sdformat->pad < csi2->num_src_pads)
+ return v4l2_subdev_get_fmt(sd, sd_state, sdformat);
+
guard(mutex)(&csi2->lock);
if (csi2->stream_count > 0)
return -EBUSY;
+ bpp = media_bus_fmt_to_csi2_bpp(sdformat->format.code);
+
+ align = v4l_get_required_align_by_bpp(bpp, 3); /* need align to 2^3 */
+
+ v4l_bound_align_image(&sdformat->format.width, 1, U16_MAX, align,
+ &sdformat->format.height, 1, U16_MAX, 0, 0);
+
/* Output pads mirror active input pad, no limits on input pads */
if (!(csi2->config->sink_pad_mask & BIT(sdformat->pad)))
sdformat->format = csi2->format_mbus;
--
2.34.1