Hi Dorota,
On 04/11/2021 12:43, Dorota Czaplejewicz wrote:
> The driver covers i.MX5/6, as well as i.MX7/8 hardware.
> Those implementations differ, e.g. in the sizes of buffers they accept.
>
> Some functionality should be abstracted, and storing type achieves that.
>
> Signed-off-by: Dorota Czaplejewicz <dorota.czaplejewicz@xxxxxxx>
> ---
> drivers/staging/media/imx/imx-ic-prpencvf.c | 3 ++-
> drivers/staging/media/imx/imx-media-capture.c | 5 ++++-
> drivers/staging/media/imx/imx-media-csi.c | 3 ++-
> drivers/staging/media/imx/imx-media.h | 8 +++++++-
> drivers/staging/media/imx/imx7-media-csi.c | 3 ++-
> 5 files changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
> index d990553de87b..e06f5fbe5174 100644
> --- a/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -1265,7 +1265,8 @@ static int prp_registered(struct v4l2_subdev *sd)
>
> priv->vdev = imx_media_capture_device_init(ic_priv->ipu_dev,
> &ic_priv->sd,
> - PRPENCVF_SRC_PAD, true);
> + PRPENCVF_SRC_PAD, true,
> + DEVICE_TYPE_IMX56);
> if (IS_ERR(priv->vdev))
> return PTR_ERR(priv->vdev);
>
> diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c
> index 93ba09236010..65dc95a48ecc 100644
> --- a/drivers/staging/media/imx/imx-media-capture.c
> +++ b/drivers/staging/media/imx/imx-media-capture.c
> @@ -34,6 +34,7 @@ struct capture_priv {
>
> struct imx_media_video_dev vdev; /* Video device */
> struct media_pad vdev_pad; /* Video device pad */
> + enum imx_media_device_type type; /* Type of hardware implementation */
>
> struct v4l2_subdev *src_sd; /* Source subdev */
> int src_sd_pad; /* Source subdev pad */
> @@ -957,7 +958,8 @@ EXPORT_SYMBOL_GPL(imx_media_capture_device_unregister);
>
> struct imx_media_video_dev *
> imx_media_capture_device_init(struct device *dev, struct v4l2_subdev *src_sd,
> - int pad, bool legacy_api)
> + int pad, bool legacy_api,
> + enum imx_media_device_type type)
> {
> struct capture_priv *priv;
> struct video_device *vfd;
> @@ -972,6 +974,7 @@ imx_media_capture_device_init(struct device *dev, struct v4l2_subdev *src_sd,
> priv->src_sd_pad = pad;
> priv->dev = dev;
> priv->legacy_api = legacy_api;
> + priv->type = type;
>
> mutex_init(&priv->mutex);
> INIT_LIST_HEAD(&priv->ready_q);
> diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
> index 6a94fff49bf6..b6758c3787c7 100644
> --- a/drivers/staging/media/imx/imx-media-csi.c
> +++ b/drivers/staging/media/imx/imx-media-csi.c
> @@ -1794,7 +1794,8 @@ static int csi_registered(struct v4l2_subdev *sd)
> }
>
> priv->vdev = imx_media_capture_device_init(priv->sd.dev, &priv->sd,
> - CSI_SRC_PAD_IDMAC, true);
> + CSI_SRC_PAD_IDMAC, true,
> + DEVICE_TYPE_IMX56);
> if (IS_ERR(priv->vdev)) {
> ret = PTR_ERR(priv->vdev);
> goto free_fim;
> diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
> index d2a150aac6cd..08e0c94e2de1 100644
> --- a/drivers/staging/media/imx/imx-media.h
> +++ b/drivers/staging/media/imx/imx-media.h
> @@ -96,6 +96,11 @@ enum imx_pixfmt_sel {
> PIXFMT_SEL_ANY = PIXFMT_SEL_YUV | PIXFMT_SEL_RGB | PIXFMT_SEL_BAYER,
> };
>
> +enum imx_media_device_type {
> + DEVICE_TYPE_IMX56,
> + DEVICE_TYPE_IMX78,
> +};
> +
> struct imx_media_buffer {
> struct vb2_v4l2_buffer vbuf; /* v4l buffer must be first */
> struct list_head list;
> @@ -282,7 +287,8 @@ int imx_media_ic_unregister(struct v4l2_subdev *sd);
> /* imx-media-capture.c */
> struct imx_media_video_dev *
> imx_media_capture_device_init(struct device *dev, struct v4l2_subdev *src_sd,
> - int pad, bool legacy_api);
> + int pad, bool legacy_api,
> + enum imx_media_device_type type);
I'm not so sure about creating an enum for this. Perhaps just a 'bool is_imx56'
would be sufficient. The argument name is also more understandable. And you also
don't have the issue of having to check for out-of-range type values.
Also, where is the device type set for imx8mq? I'm not all that familiar with
the imx code, but I don't see where imx8mq-mipi-csi2.c fills that in.
I will merge patch 1/5, that one makes sense, but I'll skip the others.
Regards,
Hans
> void imx_media_capture_device_remove(struct imx_media_video_dev *vdev);
> int imx_media_capture_device_register(struct imx_media_video_dev *vdev,
> u32 link_flags);
> diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
> index d7dc0d8edf50..1a11f07620e9 100644
> --- a/drivers/staging/media/imx/imx7-media-csi.c
> +++ b/drivers/staging/media/imx/imx7-media-csi.c
> @@ -1012,7 +1012,8 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)
> }
>
> csi->vdev = imx_media_capture_device_init(csi->sd.dev, &csi->sd,
> - IMX7_CSI_PAD_SRC, false);
> + IMX7_CSI_PAD_SRC, false,
> + DEVICE_TYPE_IMX78);
> if (IS_ERR(csi->vdev))
> return PTR_ERR(csi->vdev);
>
>
