From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933169AbdBPSTb (ORCPT ); Thu, 16 Feb 2017 13:19:31 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36591 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932752AbdBPST3 (ORCPT ); Thu, 16 Feb 2017 13:19:29 -0500 Subject: Re: [PATCH v4 36/36] media: imx: propagate sink pad formats to source pads To: Philipp Zabel References: <1487211578-11360-1-git-send-email-steve_longerbeam@mentor.com> <1487211578-11360-37-git-send-email-steve_longerbeam@mentor.com> <1487244568.2377.36.camel@pengutronix.de> Cc: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, kernel@pengutronix.de, fabio.estevam@nxp.com, linux@armlinux.org.uk, mchehab@kernel.org, hverkuil@xs4all.nl, nick@shmanahar.org, markus.heiser@darmarIT.de, laurent.pinchart+renesas@ideasonboard.com, bparrot@ti.com, geert@linux-m68k.org, arnd@arndb.de, sudipm.mukherjee@gmail.com, minghsiu.tsai@mediatek.com, tiffany.lin@mediatek.com, jean-christophe.trotin@st.com, horms+renesas@verge.net.au, niklas.soderlund+renesas@ragnatech.se, robert.jarzmik@free.fr, songjun.wu@microchip.com, andrew-ct.chen@mediatek.com, gregkh@linuxfoundation.org, shuah@kernel.org, sakari.ailus@linux.intel.com, pavel@ucw.cz, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Steve Longerbeam From: Steve Longerbeam Message-ID: <5512bed2-375b-ae31-f210-3fff4c0417c7@gmail.com> Date: Thu, 16 Feb 2017 10:19:25 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <1487244568.2377.36.camel@pengutronix.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/16/2017 03:29 AM, Philipp Zabel wrote: > On Wed, 2017-02-15 at 18:19 -0800, Steve Longerbeam wrote: > [...] >> diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c >> index dd9d499..c43f85f 100644 >> --- a/drivers/staging/media/imx/imx-ic-prpencvf.c >> +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c >> @@ -806,16 +806,22 @@ static int prp_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> - priv->format_mbus[sdformat->pad] = sdformat->format; >> + struct v4l2_mbus_framefmt *f = >> + &priv->format_mbus[sdformat->pad]; >> + struct v4l2_mbus_framefmt *outf = >> + &priv->format_mbus[PRPENCVF_SRC_PAD]; >> + >> + *f = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> - if (sdformat->pad == PRPENCVF_SRC_PAD) { >> - /* >> - * update the capture device format if this is >> - * the IDMAC output pad >> - */ >> - imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, >> - &sdformat->format, cc); >> + >> + /* propagate format to source pad */ >> + if (sdformat->pad == PRPENCVF_SINK_PAD) { >> + outf->width = f->width; >> + outf->height = f->height; > > What about media bus format, field, and colorimetry? Right, I need to propagate a default media bus format and field that works. As for colorimtery, I did see the work you are doing in your branch, but was not sure if you were finished with that support. Can you send me a patch? > >> } >> + >> + /* update the capture device format from output pad */ >> + imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, outf, cc); >> } >> >> return 0; >> diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c >> index 3e6b607..9d9ec03 100644 >> --- a/drivers/staging/media/imx/imx-media-csi.c >> +++ b/drivers/staging/media/imx/imx-media-csi.c >> @@ -1161,19 +1161,27 @@ static int csi_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> + struct v4l2_mbus_framefmt *f_direct, *f_idmac; >> + >> priv->format_mbus[sdformat->pad] = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> - /* Reset the crop window if this is the input pad */ >> - if (sdformat->pad == CSI_SINK_PAD) >> + >> + f_direct = &priv->format_mbus[CSI_SRC_PAD_DIRECT]; >> + f_idmac = &priv->format_mbus[CSI_SRC_PAD_IDMAC]; >> + >> + if (sdformat->pad == CSI_SINK_PAD) { >> + /* reset the crop window */ >> priv->crop = crop; >> - else if (sdformat->pad == CSI_SRC_PAD_IDMAC) { >> - /* >> - * update the capture device format if this is >> - * the IDMAC output pad >> - */ >> - imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, >> - &sdformat->format, cc); >> + >> + /* propagate format to source pads */ >> + f_direct->width = crop.width; >> + f_direct->height = crop.height; >> + f_idmac->width = crop.width; >> + f_idmac->height = crop.height; > > This is missing also media bus format, field and colorimetry > propagation. Yep, will add that. Steve > >> } >> + >> + /* update the capture device format from IDMAC output pad */ >> + imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, f_idmac, cc); >> } >> >> return 0; >> diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c >> index 61e6017..55fb522 100644 >> --- a/drivers/staging/media/imx/imx-media-vdic.c >> +++ b/drivers/staging/media/imx/imx-media-vdic.c >> @@ -649,8 +649,21 @@ static int vdic_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> - priv->format_mbus[sdformat->pad] = sdformat->format; >> + struct v4l2_mbus_framefmt *f = >> + &priv->format_mbus[sdformat->pad]; >> + struct v4l2_mbus_framefmt *outf = >> + &priv->format_mbus[VDIC_SRC_PAD_DIRECT]; >> + >> + *f = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> + >> + /* propagate format to source pad */ >> + if (sdformat->pad == VDIC_SINK_PAD_DIRECT || >> + sdformat->pad == VDIC_SINK_PAD_IDMAC) { >> + outf->width = f->width; >> + outf->height = f->height; >> + outf->field = V4L2_FIELD_NONE; > > This is missing colorimetry, too. > > regards > Philipp > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Longerbeam Subject: Re: [PATCH v4 36/36] media: imx: propagate sink pad formats to source pads Date: Thu, 16 Feb 2017 10:19:25 -0800 Message-ID: <5512bed2-375b-ae31-f210-3fff4c0417c7@gmail.com> References: <1487211578-11360-1-git-send-email-steve_longerbeam@mentor.com> <1487211578-11360-37-git-send-email-steve_longerbeam@mentor.com> <1487244568.2377.36.camel@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1487244568.2377.36.camel@pengutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: Philipp Zabel Cc: mark.rutland@arm.com, andrew-ct.chen@mediatek.com, minghsiu.tsai@mediatek.com, nick@shmanahar.org, songjun.wu@microchip.com, hverkuil@xs4all.nl, Steve Longerbeam , pavel@ucw.cz, robert.jarzmik@free.fr, devel@driverdev.osuosl.org, markus.heiser@darmarIT.de, laurent.pinchart+renesas@ideasonboard.com, shuah@kernel.org, linux@armlinux.org.uk, geert@linux-m68k.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, sakari.ailus@linux.intel.com, arnd@arndb.de, mchehab@kernel.org, bparrot@ti.com, robh+dt@kernel.org, horms+renesas@verge.net.au, tiffany.lin@mediatek.com, linux-arm-kernel@lists.infradead.org, niklas.soderlund+renesas@ragnatech.se, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, jean-christophe.trotin@st.com, kernel@pengutronix.de, fabio.estevam@nxp.com, shawnguo@kernel.org, sudipm.mukherjee@gmail.com List-Id: devicetree@vger.kernel.org On 02/16/2017 03:29 AM, Philipp Zabel wrote: > On Wed, 2017-02-15 at 18:19 -0800, Steve Longerbeam wrote: > [...] >> diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c >> index dd9d499..c43f85f 100644 >> --- a/drivers/staging/media/imx/imx-ic-prpencvf.c >> +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c >> @@ -806,16 +806,22 @@ static int prp_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> - priv->format_mbus[sdformat->pad] = sdformat->format; >> + struct v4l2_mbus_framefmt *f = >> + &priv->format_mbus[sdformat->pad]; >> + struct v4l2_mbus_framefmt *outf = >> + &priv->format_mbus[PRPENCVF_SRC_PAD]; >> + >> + *f = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> - if (sdformat->pad == PRPENCVF_SRC_PAD) { >> - /* >> - * update the capture device format if this is >> - * the IDMAC output pad >> - */ >> - imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, >> - &sdformat->format, cc); >> + >> + /* propagate format to source pad */ >> + if (sdformat->pad == PRPENCVF_SINK_PAD) { >> + outf->width = f->width; >> + outf->height = f->height; > > What about media bus format, field, and colorimetry? Right, I need to propagate a default media bus format and field that works. As for colorimtery, I did see the work you are doing in your branch, but was not sure if you were finished with that support. Can you send me a patch? > >> } >> + >> + /* update the capture device format from output pad */ >> + imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, outf, cc); >> } >> >> return 0; >> diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c >> index 3e6b607..9d9ec03 100644 >> --- a/drivers/staging/media/imx/imx-media-csi.c >> +++ b/drivers/staging/media/imx/imx-media-csi.c >> @@ -1161,19 +1161,27 @@ static int csi_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> + struct v4l2_mbus_framefmt *f_direct, *f_idmac; >> + >> priv->format_mbus[sdformat->pad] = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> - /* Reset the crop window if this is the input pad */ >> - if (sdformat->pad == CSI_SINK_PAD) >> + >> + f_direct = &priv->format_mbus[CSI_SRC_PAD_DIRECT]; >> + f_idmac = &priv->format_mbus[CSI_SRC_PAD_IDMAC]; >> + >> + if (sdformat->pad == CSI_SINK_PAD) { >> + /* reset the crop window */ >> priv->crop = crop; >> - else if (sdformat->pad == CSI_SRC_PAD_IDMAC) { >> - /* >> - * update the capture device format if this is >> - * the IDMAC output pad >> - */ >> - imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, >> - &sdformat->format, cc); >> + >> + /* propagate format to source pads */ >> + f_direct->width = crop.width; >> + f_direct->height = crop.height; >> + f_idmac->width = crop.width; >> + f_idmac->height = crop.height; > > This is missing also media bus format, field and colorimetry > propagation. Yep, will add that. Steve > >> } >> + >> + /* update the capture device format from IDMAC output pad */ >> + imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, f_idmac, cc); >> } >> >> return 0; >> diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c >> index 61e6017..55fb522 100644 >> --- a/drivers/staging/media/imx/imx-media-vdic.c >> +++ b/drivers/staging/media/imx/imx-media-vdic.c >> @@ -649,8 +649,21 @@ static int vdic_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> - priv->format_mbus[sdformat->pad] = sdformat->format; >> + struct v4l2_mbus_framefmt *f = >> + &priv->format_mbus[sdformat->pad]; >> + struct v4l2_mbus_framefmt *outf = >> + &priv->format_mbus[VDIC_SRC_PAD_DIRECT]; >> + >> + *f = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> + >> + /* propagate format to source pad */ >> + if (sdformat->pad == VDIC_SINK_PAD_DIRECT || >> + sdformat->pad == VDIC_SINK_PAD_IDMAC) { >> + outf->width = f->width; >> + outf->height = f->height; >> + outf->field = V4L2_FIELD_NONE; > > This is missing colorimetry, too. > > regards > Philipp > From mboxrd@z Thu Jan 1 00:00:00 1970 From: slongerbeam@gmail.com (Steve Longerbeam) Date: Thu, 16 Feb 2017 10:19:25 -0800 Subject: [PATCH v4 36/36] media: imx: propagate sink pad formats to source pads In-Reply-To: <1487244568.2377.36.camel@pengutronix.de> References: <1487211578-11360-1-git-send-email-steve_longerbeam@mentor.com> <1487211578-11360-37-git-send-email-steve_longerbeam@mentor.com> <1487244568.2377.36.camel@pengutronix.de> Message-ID: <5512bed2-375b-ae31-f210-3fff4c0417c7@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 02/16/2017 03:29 AM, Philipp Zabel wrote: > On Wed, 2017-02-15 at 18:19 -0800, Steve Longerbeam wrote: > [...] >> diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c >> index dd9d499..c43f85f 100644 >> --- a/drivers/staging/media/imx/imx-ic-prpencvf.c >> +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c >> @@ -806,16 +806,22 @@ static int prp_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> - priv->format_mbus[sdformat->pad] = sdformat->format; >> + struct v4l2_mbus_framefmt *f = >> + &priv->format_mbus[sdformat->pad]; >> + struct v4l2_mbus_framefmt *outf = >> + &priv->format_mbus[PRPENCVF_SRC_PAD]; >> + >> + *f = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> - if (sdformat->pad == PRPENCVF_SRC_PAD) { >> - /* >> - * update the capture device format if this is >> - * the IDMAC output pad >> - */ >> - imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, >> - &sdformat->format, cc); >> + >> + /* propagate format to source pad */ >> + if (sdformat->pad == PRPENCVF_SINK_PAD) { >> + outf->width = f->width; >> + outf->height = f->height; > > What about media bus format, field, and colorimetry? Right, I need to propagate a default media bus format and field that works. As for colorimtery, I did see the work you are doing in your branch, but was not sure if you were finished with that support. Can you send me a patch? > >> } >> + >> + /* update the capture device format from output pad */ >> + imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, outf, cc); >> } >> >> return 0; >> diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c >> index 3e6b607..9d9ec03 100644 >> --- a/drivers/staging/media/imx/imx-media-csi.c >> +++ b/drivers/staging/media/imx/imx-media-csi.c >> @@ -1161,19 +1161,27 @@ static int csi_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> + struct v4l2_mbus_framefmt *f_direct, *f_idmac; >> + >> priv->format_mbus[sdformat->pad] = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> - /* Reset the crop window if this is the input pad */ >> - if (sdformat->pad == CSI_SINK_PAD) >> + >> + f_direct = &priv->format_mbus[CSI_SRC_PAD_DIRECT]; >> + f_idmac = &priv->format_mbus[CSI_SRC_PAD_IDMAC]; >> + >> + if (sdformat->pad == CSI_SINK_PAD) { >> + /* reset the crop window */ >> priv->crop = crop; >> - else if (sdformat->pad == CSI_SRC_PAD_IDMAC) { >> - /* >> - * update the capture device format if this is >> - * the IDMAC output pad >> - */ >> - imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, >> - &sdformat->format, cc); >> + >> + /* propagate format to source pads */ >> + f_direct->width = crop.width; >> + f_direct->height = crop.height; >> + f_idmac->width = crop.width; >> + f_idmac->height = crop.height; > > This is missing also media bus format, field and colorimetry > propagation. Yep, will add that. Steve > >> } >> + >> + /* update the capture device format from IDMAC output pad */ >> + imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, f_idmac, cc); >> } >> >> return 0; >> diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c >> index 61e6017..55fb522 100644 >> --- a/drivers/staging/media/imx/imx-media-vdic.c >> +++ b/drivers/staging/media/imx/imx-media-vdic.c >> @@ -649,8 +649,21 @@ static int vdic_set_fmt(struct v4l2_subdev *sd, >> if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) { >> cfg->try_fmt = sdformat->format; >> } else { >> - priv->format_mbus[sdformat->pad] = sdformat->format; >> + struct v4l2_mbus_framefmt *f = >> + &priv->format_mbus[sdformat->pad]; >> + struct v4l2_mbus_framefmt *outf = >> + &priv->format_mbus[VDIC_SRC_PAD_DIRECT]; >> + >> + *f = sdformat->format; >> priv->cc[sdformat->pad] = cc; >> + >> + /* propagate format to source pad */ >> + if (sdformat->pad == VDIC_SINK_PAD_DIRECT || >> + sdformat->pad == VDIC_SINK_PAD_IDMAC) { >> + outf->width = f->width; >> + outf->height = f->height; >> + outf->field = V4L2_FIELD_NONE; > > This is missing colorimetry, too. > > regards > Philipp >