* [PATCH v2 0/2] imx7-media-csi: small cleanup @ 2023-03-21 7:27 Alexander Stein 2023-03-21 7:27 ` [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init Alexander Stein 2023-03-21 7:27 ` [PATCH v2 2/2] media: imx: imx7-media-csi: Fail on invalid type in VIDIOC_G_SELECTION Alexander Stein 0 siblings, 2 replies; 6+ messages in thread From: Alexander Stein @ 2023-03-21 7:27 UTC (permalink / raw) To: Rui Miguel Silva, Laurent Pinchart, Mauro Carvalho Chehab, Shawn Guo, Sascha Hauer, Fabio Estevam Cc: Alexander Stein, Pengutronix Kernel Team, NXP Linux Team, linux-media, linux-arm-kernel Hi all, this is v2 of a small series for 7mx-media-csi cleanup. Changes in v2: * State the reason for patch 1 in commit message * Drop 'Fixes' in patch 1 * Collect R-b in patch 2 * Drop patch 3. it's superfluous Regards, Alexander Alexander Stein (2): media: imx: imx7-media-csi: Fix mbus framefmt field init media: imx: imx7-media-csi: Fail on invalid type in VIDIOC_G_SELECTION drivers/media/platform/nxp/imx7-media-csi.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init 2023-03-21 7:27 [PATCH v2 0/2] imx7-media-csi: small cleanup Alexander Stein @ 2023-03-21 7:27 ` Alexander Stein 2023-03-21 9:37 ` Laurent Pinchart 2023-03-21 15:00 ` Rui Miguel Silva 2023-03-21 7:27 ` [PATCH v2 2/2] media: imx: imx7-media-csi: Fail on invalid type in VIDIOC_G_SELECTION Alexander Stein 1 sibling, 2 replies; 6+ messages in thread From: Alexander Stein @ 2023-03-21 7:27 UTC (permalink / raw) To: Rui Miguel Silva, Laurent Pinchart, Mauro Carvalho Chehab, Shawn Guo, Sascha Hauer, Fabio Estevam Cc: Alexander Stein, Pengutronix Kernel Team, NXP Linux Team, linux-media, linux-arm-kernel 'field' is zero-initialized to V4L2_FIELD_ANY, which is an invalid value to return to userspace. Instead fefault to non-interleaving. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> --- drivers/media/platform/nxp/imx7-media-csi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index c22bf5c827e7..3e97b9f2ff69 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1610,6 +1610,7 @@ static int imx7_csi_video_init_format(struct imx7_csi *csi) format.code = IMX7_CSI_DEF_MBUS_CODE; format.width = IMX7_CSI_DEF_PIX_WIDTH; format.height = IMX7_CSI_DEF_PIX_HEIGHT; + format.field = V4L2_FIELD_NONE; imx7_csi_mbus_fmt_to_pix_fmt(&csi->vdev_fmt, &format, NULL); csi->vdev_compose.width = format.width; -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init 2023-03-21 7:27 ` [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init Alexander Stein @ 2023-03-21 9:37 ` Laurent Pinchart 2023-03-21 10:08 ` Alexander Stein 2023-03-21 15:00 ` Rui Miguel Silva 1 sibling, 1 reply; 6+ messages in thread From: Laurent Pinchart @ 2023-03-21 9:37 UTC (permalink / raw) To: Alexander Stein Cc: Rui Miguel Silva, Mauro Carvalho Chehab, Shawn Guo, Sascha Hauer, Fabio Estevam, Pengutronix Kernel Team, NXP Linux Team, linux-media, linux-arm-kernel Hi Alexander, Thank you for the patch. On Tue, Mar 21, 2023 at 08:27:06AM +0100, Alexander Stein wrote: > 'field' is zero-initialized to V4L2_FIELD_ANY, which is an invalid value > to return to userspace. Instead fefault to non-interleaving. I prefer defaulting to non-interleaving instead of fefaulting :-) I'll fix the typo in my tree. > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/platform/nxp/imx7-media-csi.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c > index c22bf5c827e7..3e97b9f2ff69 100644 > --- a/drivers/media/platform/nxp/imx7-media-csi.c > +++ b/drivers/media/platform/nxp/imx7-media-csi.c > @@ -1610,6 +1610,7 @@ static int imx7_csi_video_init_format(struct imx7_csi *csi) > format.code = IMX7_CSI_DEF_MBUS_CODE; > format.width = IMX7_CSI_DEF_PIX_WIDTH; > format.height = IMX7_CSI_DEF_PIX_HEIGHT; > + format.field = V4L2_FIELD_NONE; > > imx7_csi_mbus_fmt_to_pix_fmt(&csi->vdev_fmt, &format, NULL); > csi->vdev_compose.width = format.width; -- Regards, Laurent Pinchart _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init 2023-03-21 9:37 ` Laurent Pinchart @ 2023-03-21 10:08 ` Alexander Stein 0 siblings, 0 replies; 6+ messages in thread From: Alexander Stein @ 2023-03-21 10:08 UTC (permalink / raw) To: Laurent Pinchart Cc: Rui Miguel Silva, Mauro Carvalho Chehab, Shawn Guo, Sascha Hauer, Fabio Estevam, Pengutronix Kernel Team, NXP Linux Team, linux-media, linux-arm-kernel Hi Laurent, Am Dienstag, 21. März 2023, 10:37:57 CET schrieb Laurent Pinchart: > Hi Alexander, > > Thank you for the patch. > > On Tue, Mar 21, 2023 at 08:27:06AM +0100, Alexander Stein wrote: > > 'field' is zero-initialized to V4L2_FIELD_ANY, which is an invalid value > > to return to userspace. Instead fefault to non-interleaving. > > I prefer defaulting to non-interleaving instead of fefaulting :-) I'll > fix the typo in my tree. Oh :-) thanks for fixing this. Best regards, Alexander > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > --- > > > > drivers/media/platform/nxp/imx7-media-csi.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/media/platform/nxp/imx7-media-csi.c > > b/drivers/media/platform/nxp/imx7-media-csi.c index > > c22bf5c827e7..3e97b9f2ff69 100644 > > --- a/drivers/media/platform/nxp/imx7-media-csi.c > > +++ b/drivers/media/platform/nxp/imx7-media-csi.c > > @@ -1610,6 +1610,7 @@ static int imx7_csi_video_init_format(struct > > imx7_csi *csi)> > > format.code = IMX7_CSI_DEF_MBUS_CODE; > > format.width = IMX7_CSI_DEF_PIX_WIDTH; > > format.height = IMX7_CSI_DEF_PIX_HEIGHT; > > > > + format.field = V4L2_FIELD_NONE; > > > > imx7_csi_mbus_fmt_to_pix_fmt(&csi->vdev_fmt, &format, NULL); > > csi->vdev_compose.width = format.width; -- TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init 2023-03-21 7:27 ` [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init Alexander Stein 2023-03-21 9:37 ` Laurent Pinchart @ 2023-03-21 15:00 ` Rui Miguel Silva 1 sibling, 0 replies; 6+ messages in thread From: Rui Miguel Silva @ 2023-03-21 15:00 UTC (permalink / raw) To: Alexander Stein, Laurent Pinchart, Mauro Carvalho Chehab, Shawn Guo, Sascha Hauer, Fabio Estevam Cc: Alexander Stein, Pengutronix Kernel Team, NXP Linux Team, linux-media, linux-arm-kernel Hi Alexander, Alexander Stein <alexander.stein@ew.tq-group.com> writes: > 'field' is zero-initialized to V4L2_FIELD_ANY, which is an invalid value > to return to userspace. Instead fefault to non-interleaving. > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Many thanks for adding this much better change log. (with the already mention fefault fix from Laurent :) ) Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com> Cheers, Rui > --- > drivers/media/platform/nxp/imx7-media-csi.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c > index c22bf5c827e7..3e97b9f2ff69 100644 > --- a/drivers/media/platform/nxp/imx7-media-csi.c > +++ b/drivers/media/platform/nxp/imx7-media-csi.c > @@ -1610,6 +1610,7 @@ static int imx7_csi_video_init_format(struct imx7_csi *csi) > format.code = IMX7_CSI_DEF_MBUS_CODE; > format.width = IMX7_CSI_DEF_PIX_WIDTH; > format.height = IMX7_CSI_DEF_PIX_HEIGHT; > + format.field = V4L2_FIELD_NONE; > > imx7_csi_mbus_fmt_to_pix_fmt(&csi->vdev_fmt, &format, NULL); > csi->vdev_compose.width = format.width; > -- > 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] media: imx: imx7-media-csi: Fail on invalid type in VIDIOC_G_SELECTION 2023-03-21 7:27 [PATCH v2 0/2] imx7-media-csi: small cleanup Alexander Stein 2023-03-21 7:27 ` [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init Alexander Stein @ 2023-03-21 7:27 ` Alexander Stein 1 sibling, 0 replies; 6+ messages in thread From: Alexander Stein @ 2023-03-21 7:27 UTC (permalink / raw) To: Rui Miguel Silva, Laurent Pinchart, Mauro Carvalho Chehab, Shawn Guo, Sascha Hauer, Fabio Estevam Cc: Alexander Stein, Pengutronix Kernel Team, NXP Linux Team, linux-media, linux-arm-kernel This device only supports video capture, so bail out if invalid selection type is passed. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com> --- drivers/media/platform/nxp/imx7-media-csi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index 3e97b9f2ff69..389d7d88b341 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1214,6 +1214,9 @@ static int imx7_csi_video_g_selection(struct file *file, void *fh, { struct imx7_csi *csi = video_drvdata(file); + if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + switch (s->target) { case V4L2_SEL_TGT_COMPOSE: case V4L2_SEL_TGT_COMPOSE_DEFAULT: -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-21 15:02 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-03-21 7:27 [PATCH v2 0/2] imx7-media-csi: small cleanup Alexander Stein 2023-03-21 7:27 ` [PATCH v2 1/2] media: imx: imx7-media-csi: Fix mbus framefmt field init Alexander Stein 2023-03-21 9:37 ` Laurent Pinchart 2023-03-21 10:08 ` Alexander Stein 2023-03-21 15:00 ` Rui Miguel Silva 2023-03-21 7:27 ` [PATCH v2 2/2] media: imx: imx7-media-csi: Fail on invalid type in VIDIOC_G_SELECTION Alexander Stein
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).