Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 09 Oct 2019 00:19:39 +0000
To:     linux-media@vger.kernel.org
From:   =?UTF-8?Q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= 
        <nfraprado@protonmail.com>
Cc:     Helen Koike <helen.koike@collabora.com>,
        Shuah Khan <skhan@linuxfoundation.org>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Hans Verkuil <hverkuil@xs4all.nl>,
        linux-kernel@vger.kernel.org, lkcamp@lists.libreplanetbr.org
Reply-To: =?UTF-8?Q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= 
          <nfraprado@protonmail.com>
Subject: [PATCH v2] media: vimc: Make capture devices and subdevices use different link_validates
Message-ID: <20191009001854.2253748-1-nfraprado@protonmail.com>
Feedback-ID: cwTKJQq-dqva77NrgNeIaWzOvcDQqfI9VSy7DoyJdvgY6-nEE7fD-E-3GiKFHexW4OBWbzutmMZN6q4SflMDRw==:Ext:ProtonMail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Instead of validating the links to capture devices and subdevices with
the same function, use the default v4l function for links between
subdevices and only use a different function for validating between
capture device and subdevice.
This change should also ease future work to associate multiple mbus
codes for the same pixelformat in vimc_pix_map.

These changes were tested with
v4l2-compliance SHA: 3f806630e2ecbcebe31872b865c5c4b42f111a99, 64 bits
and passed all tests:
Grand Total for vimc device /dev/media0: 451, Succeeded: 451, Failed: 0, Wa=
rnings: 0

Signed-off-by: N=C3=ADcolas F. R. A. Prado <nfraprado@protonmail.com>
---
Changes in v2:
- Remove blank lines
- Rename vimc_cap_link_validate to vimc_vdev_link_validate and move it back=
 to
  vimc-common.c
- Fix style issue on vimc_get_pix_format header
- Remove vimc_get_pix_format declaration from vimc-common.h

 drivers/media/platform/vimc/vimc-capture.c |  2 +-
 drivers/media/platform/vimc/vimc-common.c  | 86 +++++++++++-----------
 drivers/media/platform/vimc/vimc-common.h  |  4 +-
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/pla=
tform/vimc/vimc-capture.c
index 602f80323031..75daebd625a8 100644
--- a/drivers/media/platform/vimc/vimc-capture.c
+++ b/drivers/media/platform/vimc/vimc-capture.c
@@ -322,7 +322,7 @@ static const struct vb2_ops vimc_cap_qops =3D {
 };
=20
 static const struct media_entity_operations vimc_cap_mops =3D {
-=09.link_validate=09=09=3D vimc_link_validate,
+=09.link_validate=09=09=3D vimc_vdev_link_validate,
 };
=20
 static void vimc_cap_release(struct video_device *vdev)
diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/plat=
form/vimc/vimc-common.c
index a3120f4f7a90..a67813e750d9 100644
--- a/drivers/media/platform/vimc/vimc-common.c
+++ b/drivers/media/platform/vimc/vimc-common.c
@@ -247,35 +247,35 @@ int vimc_pipeline_s_stream(struct media_entity *ent, =
int enable)
 }
 EXPORT_SYMBOL_GPL(vimc_pipeline_s_stream);
=20
-static int vimc_get_mbus_format(struct media_pad *pad,
-=09=09=09=09struct v4l2_subdev_format *fmt)
+int vimc_get_pix_format(struct media_pad *pad, struct v4l2_pix_format *fmt=
)
 {
 =09if (is_media_entity_v4l2_subdev(pad->entity)) {
 =09=09struct v4l2_subdev *sd =3D
 =09=09=09media_entity_to_v4l2_subdev(pad->entity);
+=09=09struct v4l2_subdev_format sd_fmt;
+=09=09const struct vimc_pix_map *pix_map;
 =09=09int ret;
=20
-=09=09fmt->which =3D V4L2_SUBDEV_FORMAT_ACTIVE;
-=09=09fmt->pad =3D pad->index;
+=09=09sd_fmt.which =3D V4L2_SUBDEV_FORMAT_ACTIVE;
+=09=09sd_fmt.pad =3D pad->index;
=20
-=09=09ret =3D v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt);
+=09=09ret =3D v4l2_subdev_call(sd, pad, get_fmt, NULL, &sd_fmt);
 =09=09if (ret)
 =09=09=09return ret;
=20
+=09=09v4l2_fill_pix_format(fmt, &sd_fmt.format);
+=09=09pix_map =3D vimc_pix_map_by_code(sd_fmt.format.code);
+=09=09fmt->pixelformat =3D pix_map->pixelformat;
 =09} else if (is_media_entity_v4l2_video_device(pad->entity)) {
 =09=09struct video_device *vdev =3D container_of(pad->entity,
 =09=09=09=09=09=09=09 struct video_device,
 =09=09=09=09=09=09=09 entity);
 =09=09struct vimc_ent_device *ved =3D video_get_drvdata(vdev);
-=09=09const struct vimc_pix_map *vpix;
-=09=09struct v4l2_pix_format vdev_fmt;
=20
 =09=09if (!ved->vdev_get_format)
 =09=09=09return -ENOIOCTLCMD;
=20
-=09=09ved->vdev_get_format(ved, &vdev_fmt);
-=09=09vpix =3D vimc_pix_map_by_pixelformat(vdev_fmt.pixelformat);
-=09=09v4l2_fill_mbus_format(&fmt->format, &vdev_fmt, vpix->code);
+=09=09ved->vdev_get_format(ved, fmt);
 =09} else {
 =09=09return -EINVAL;
 =09}
@@ -283,16 +283,16 @@ static int vimc_get_mbus_format(struct media_pad *pad=
,
 =09return 0;
 }
=20
-int vimc_link_validate(struct media_link *link)
+int vimc_vdev_link_validate(struct media_link *link)
 {
-=09struct v4l2_subdev_format source_fmt, sink_fmt;
+=09struct v4l2_pix_format source_fmt, sink_fmt;
 =09int ret;
=20
-=09ret =3D vimc_get_mbus_format(link->source, &source_fmt);
+=09ret =3D vimc_get_pix_format(link->source, &source_fmt);
 =09if (ret)
 =09=09return ret;
=20
-=09ret =3D vimc_get_mbus_format(link->sink, &sink_fmt);
+=09ret =3D vimc_get_pix_format(link->sink, &sink_fmt);
 =09if (ret)
 =09=09return ret;
=20
@@ -301,21 +301,21 @@ int vimc_link_validate(struct media_link *link)
 =09=09"%s:snk:%dx%d (0x%x, %d, %d, %d, %d)\n",
 =09=09/* src */
 =09=09link->source->entity->name,
-=09=09source_fmt.format.width, source_fmt.format.height,
-=09=09source_fmt.format.code, source_fmt.format.colorspace,
-=09=09source_fmt.format.quantization, source_fmt.format.xfer_func,
-=09=09source_fmt.format.ycbcr_enc,
+=09=09source_fmt.width, source_fmt.height,
+=09=09source_fmt.pixelformat, source_fmt.colorspace,
+=09=09source_fmt.quantization, source_fmt.xfer_func,
+=09=09source_fmt.ycbcr_enc,
 =09=09/* sink */
 =09=09link->sink->entity->name,
-=09=09sink_fmt.format.width, sink_fmt.format.height,
-=09=09sink_fmt.format.code, sink_fmt.format.colorspace,
-=09=09sink_fmt.format.quantization, sink_fmt.format.xfer_func,
-=09=09sink_fmt.format.ycbcr_enc);
-
-=09/* The width, height and code must match. */
-=09if (source_fmt.format.width !=3D sink_fmt.format.width
-=09    || source_fmt.format.height !=3D sink_fmt.format.height
-=09    || source_fmt.format.code !=3D sink_fmt.format.code)
+=09=09sink_fmt.width, sink_fmt.height,
+=09=09sink_fmt.pixelformat, sink_fmt.colorspace,
+=09=09sink_fmt.quantization, sink_fmt.xfer_func,
+=09=09sink_fmt.ycbcr_enc);
+
+=09/* The width, height and pixelformat must match. */
+=09if (source_fmt.width !=3D sink_fmt.width
+=09    || source_fmt.height !=3D sink_fmt.height
+=09    || source_fmt.pixelformat !=3D sink_fmt.pixelformat)
 =09=09return -EPIPE;
=20
 =09/*
@@ -323,44 +323,44 @@ int vimc_link_validate(struct media_link *link)
 =09 * to support interlaced hardware connected to bridges that support
 =09 * progressive formats only.
 =09 */
-=09if (source_fmt.format.field !=3D sink_fmt.format.field &&
-=09    sink_fmt.format.field !=3D V4L2_FIELD_NONE)
+=09if (source_fmt.field !=3D sink_fmt.field &&
+=09    sink_fmt.field !=3D V4L2_FIELD_NONE)
 =09=09return -EPIPE;
=20
 =09/*
 =09 * If colorspace is DEFAULT, then assume all the colorimetry is also
 =09 * DEFAULT, return 0 to skip comparing the other colorimetry parameters
 =09 */
-=09if (source_fmt.format.colorspace =3D=3D V4L2_COLORSPACE_DEFAULT
-=09    || sink_fmt.format.colorspace =3D=3D V4L2_COLORSPACE_DEFAULT)
+=09if (source_fmt.colorspace =3D=3D V4L2_COLORSPACE_DEFAULT
+=09    || sink_fmt.colorspace =3D=3D V4L2_COLORSPACE_DEFAULT)
 =09=09return 0;
=20
 =09/* Colorspace must match. */
-=09if (source_fmt.format.colorspace !=3D sink_fmt.format.colorspace)
+=09if (source_fmt.colorspace !=3D sink_fmt.colorspace)
 =09=09return -EPIPE;
=20
 =09/* Colorimetry must match if they are not set to DEFAULT */
-=09if (source_fmt.format.ycbcr_enc !=3D V4L2_YCBCR_ENC_DEFAULT
-=09    && sink_fmt.format.ycbcr_enc !=3D V4L2_YCBCR_ENC_DEFAULT
-=09    && source_fmt.format.ycbcr_enc !=3D sink_fmt.format.ycbcr_enc)
+=09if (source_fmt.ycbcr_enc !=3D V4L2_YCBCR_ENC_DEFAULT
+=09    && sink_fmt.ycbcr_enc !=3D V4L2_YCBCR_ENC_DEFAULT
+=09    && source_fmt.ycbcr_enc !=3D sink_fmt.ycbcr_enc)
 =09=09return -EPIPE;
=20
-=09if (source_fmt.format.quantization !=3D V4L2_QUANTIZATION_DEFAULT
-=09    && sink_fmt.format.quantization !=3D V4L2_QUANTIZATION_DEFAULT
-=09    && source_fmt.format.quantization !=3D sink_fmt.format.quantization=
)
+=09if (source_fmt.quantization !=3D V4L2_QUANTIZATION_DEFAULT
+=09    && sink_fmt.quantization !=3D V4L2_QUANTIZATION_DEFAULT
+=09    && source_fmt.quantization !=3D sink_fmt.quantization)
 =09=09return -EPIPE;
=20
-=09if (source_fmt.format.xfer_func !=3D V4L2_XFER_FUNC_DEFAULT
-=09    && sink_fmt.format.xfer_func !=3D V4L2_XFER_FUNC_DEFAULT
-=09    && source_fmt.format.xfer_func !=3D sink_fmt.format.xfer_func)
+=09if (source_fmt.xfer_func !=3D V4L2_XFER_FUNC_DEFAULT
+=09    && sink_fmt.xfer_func !=3D V4L2_XFER_FUNC_DEFAULT
+=09    && source_fmt.xfer_func !=3D sink_fmt.xfer_func)
 =09=09return -EPIPE;
=20
 =09return 0;
 }
-EXPORT_SYMBOL_GPL(vimc_link_validate);
+EXPORT_SYMBOL_GPL(vimc_vdev_link_validate);
=20
 static const struct media_entity_operations vimc_ent_sd_mops =3D {
-=09.link_validate =3D vimc_link_validate,
+=09.link_validate =3D v4l2_subdev_link_validate,
 };
=20
 int vimc_ent_sd_register(struct vimc_ent_device *ved,
diff --git a/drivers/media/platform/vimc/vimc-common.h b/drivers/media/plat=
form/vimc/vimc-common.h
index 698db7c07645..145cee076bd7 100644
--- a/drivers/media/platform/vimc/vimc-common.h
+++ b/drivers/media/platform/vimc/vimc-common.h
@@ -264,12 +264,12 @@ void vimc_ent_sd_unregister(struct vimc_ent_device *v=
ed,
 =09=09=09    struct v4l2_subdev *sd);
=20
 /**
- * vimc_link_validate - validates a media link
+ * vimc_vdev_link_validate - validates a media link
  *
  * @link: pointer to &struct media_link
  *
  * This function calls validates if a media link is valid for streaming.
  */
-int vimc_link_validate(struct media_link *link);
+int vimc_vdev_link_validate(struct media_link *link);
=20
 #endif
--=20
2.23.0