Switch to sync registration for IPU subdevs
Steve Longerbeam
maintainerv5 cover Switch to sync registration for IPU subdevs
Switch to sync registration for the IPU internal sub-devices, re-organize modules, and a few other miscellaneous cleanups.
History:
v5:
- Revert commit 16204b8a1c1a ("media: staging/imx: add media device to capture register").
v4:
- Add **cc arg to __capture_try_fmt_vid_cap() to validate colorspace, instead of calling ipu_pixelformat_to_colorspace().
- Add error message if capture format validation failed.
v3:
- A couple patches did not compile/link. All patches now build so the series is fully bisectable. No functional changes.
v2:
- Added a patch that improves the pipeline upstream/downstream search functions, which no longer require the media device.
- Add a patch to remove getting media device from v4l2_dev driver data.
Steve Longerbeam (9):
Revert "media: staging/imx: add media device to capture register"
media: staging/imx: Switch to sync registration for IPU subdevs
media: staging/imx: Pass device to alloc/free_dma_buf
media: staging/imx: Move add_video_device into capture_device_register Revert "media: imx: Set capture compose rectangle in
capture_device_set_format"
media: staging/imx: Remove capture_device_set_format
media: staging/imx: Re-organize modules
media: staging/imx: Improve pipeline searching
media: staging/imx: Don't set driver data for v4l2_dev
drivers/staging/media/imx/Makefile | 18 +- drivers/staging/media/imx/imx-ic-common.c | 68 +-- drivers/staging/media/imx/imx-ic-prp.c | 36 +- drivers/staging/media/imx/imx-ic-prpencvf.c | 90 ++-- drivers/staging/media/imx/imx-ic.h | 6 +- drivers/staging/media/imx/imx-media-capture.c | 94 ++-- drivers/staging/media/imx/imx-media-csi.c | 47 +- .../staging/media/imx/imx-media-dev-common.c | 346 +++++++++++++- drivers/staging/media/imx/imx-media-dev.c | 449 +----------------- drivers/staging/media/imx/imx-media-fim.c | 9 - .../staging/media/imx/imx-media-internal-sd.c | 357 ++++++-------- drivers/staging/media/imx/imx-media-of.c | 41 +- drivers/staging/media/imx/imx-media-utils.c | 170 +++---- drivers/staging/media/imx/imx-media-vdic.c | 84 +--- drivers/staging/media/imx/imx-media.h | 116 +++-- drivers/staging/media/imx/imx7-media-csi.c | 43 +- 16 files changed, 862 insertions(+), 1112 deletions(-)
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v5 1/9 Revert "media: staging/imx: add media device to capture register"
The imx6-specific subdevs that register a capture device will no longer hold a reference to the media device, so this commit must be reverted.
This reverts commit 16204b8a1c1af77725533b77936e6c73953486ae.
--- drivers/staging/media/imx/imx-ic-prpencvf.c | 2 +- drivers/staging/media/imx/imx-media-capture.c | 6 +++--- drivers/staging/media/imx/imx-media-csi.c | 2 +- drivers/staging/media/imx/imx-media.h | 3 +-- drivers/staging/media/imx/imx7-media-csi.c | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-)
drivers/staging/media/imx/imx-ic-prpencvf.c +1 -1
@@ -1270,7 +1270,7 @@ static int prp_registered(struct v4l2_subdev *sd)if (ret)return ret; - ret =imx_media_capture_device_register (priv->md, priv->vdev); + ret =imx_media_capture_device_register (priv->vdev);if (ret)return ret;
drivers/staging/media/imx/imx-media-capture.c +3 -3
@@ -706,8 +706,7 @@ void imx_media_capture_device_error(struct imx_media_video_dev *vdev) }EXPORT_SYMBOL_GPL (imx_media_capture_device_error); -int imx_media_capture_device_register (struct imx_media_dev *md, -struct imx_media_video_dev *vdev) +int imx_media_capture_device_register (struct imx_media_video_dev *vdev) {struct capture_priv *priv =to_capture_priv (vdev);struct v4l2_subdev *sd = priv->src_sd;
@@ -716,7 +715,8 @@ int imx_media_capture_device_register(struct imx_media_dev *md,struct v4l2_subdev_format fmt_src;int ret; - priv->md = md; +/* get media device */ + priv->md =dev_get_drvdata (sd->v4l2_dev->dev); vfd->v4l2_dev = sd->v4l2_dev;
drivers/staging/media/imx/imx-media-csi.c +1 -1
@@ -1816,7 +1816,7 @@ static int csi_registered(struct v4l2_subdev *sd)if (ret) goto free_fim; - ret =imx_media_capture_device_register (priv->md, priv->vdev); + ret =imx_media_capture_device_register (priv->vdev);if (ret) goto free_fim;
drivers/staging/media/imx/imx-media.h +1 -2
@@ -272,8 +272,7 @@ int imx_media_of_add_csi(struct imx_media_dev *imxmd,struct imx_media_video_dev *imx_media_capture_device_init (struct v4l2_subdev *src_sd,int pad);void imx_media_capture_device_remove (struct imx_media_video_dev *vdev); -int imx_media_capture_device_register (struct imx_media_dev *md, -struct imx_media_video_dev *vdev); +int imx_media_capture_device_register (struct imx_media_video_dev *vdev);void imx_media_capture_device_unregister (struct imx_media_video_dev *vdev);struct imx_media_buffer *imx_media_capture_device_next_buf (struct imx_media_video_dev *vdev);
drivers/staging/media/imx/imx7-media-csi.c +1 -1
@@ -1126,7 +1126,7 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)if (ret <0 )return ret; - ret =imx_media_capture_device_register (csi->imxmd, csi->vdev); + ret =imx_media_capture_device_register (csi->vdev);if (ret <0 )return ret;
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v5 2/9 media: staging/imx: Switch to sync registration for IPU subdevs
In reply to Steve LongerbeamBecause the IPU sub-devices VDIC and IC are not present in the device-tree, platform devices were created for them instead. This allowed these sub-devices to be added to the media device's async notifier and registered asynchronously along with the other sub-devices that do have a device-tree presence (CSI and devices external to the IPU and SoC).
But that approach isn't really necessary. The IPU sub-devices don't actually require a backing device (sd->dev is allowed to be NULL). And that approach can't get around the fact that the IPU sub-devices are not part of a device hierarchy, which makes it awkward to retrieve the parent IPU of these devices.
By registering them synchronously, they can be registered from the CSI async bound notifier, so the init function for them can be given the CSI subdev, who's dev->parent is the IPU. That is a somewhat cleaner way to retrieve the parent IPU.
So convert to synchronous registration for the VDIC and IC task sub-devices, at the time a CSI sub-device is bound. There is no longer a backing device for them (sd->dev is NULL), but that's ok. Also set the VDIC/IC sub-device owner as the IPU, so that a reference can be taken on the IPU module.
Since the VDIC and IC task drivers are no longer platform drivers, they are now statically linked to imx-media module.
---
Changes in v3:
- statically link VDIC and IC task objects to imx-media module in Makefile.
--- drivers/staging/media/imx/Makefile | 6 +- drivers/staging/media/imx/imx-ic-common.c | 70 ++-- drivers/staging/media/imx/imx-ic-prp.c | 34 +- drivers/staging/media/imx/imx-ic-prpencvf.c | 70 ++-- drivers/staging/media/imx/imx-ic.h | 7 +- drivers/staging/media/imx/imx-media-capture.c | 7 +- drivers/staging/media/imx/imx-media-csi.c | 2 +- drivers/staging/media/imx/imx-media-dev.c | 121 +----- .../staging/media/imx/imx-media-internal-sd.c | 356 ++++++++---------- drivers/staging/media/imx/imx-media-of.c | 38 +- drivers/staging/media/imx/imx-media-vdic.c | 85 ++--- drivers/staging/media/imx/imx-media.h | 67 ++-- drivers/staging/media/imx/imx7-media-csi.c | 3 +- 13 files changed, 327 insertions(+), 539 deletions(-)
drivers/staging/media/imx/Makefile +2 -4
@@ -1,14 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 -imx-media-objs := imx-media-dev.o imx-media-internal-sd.o imx-media-of.o +imx-media-objs := imx-media-dev.o imx-media-internal-sd.o imx-media-of.o \ + imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o imx-media-vdic.o imx-media-objs += imx-media-dev-common.o imx-media-common-objs := imx-media-utils.o imx-media-fim.o -imx-media-ic-objs := imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media.o obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-capture.o -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-vdic.o -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-ic.o obj-$(CONFIG_VIDEO_IMX_CSI) += imx-media-csi.o obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
drivers/staging/media/imx/imx-ic-common.c +25 -45
118 lines not on this page · raw message
drivers/staging/media/imx/imx-ic-prp.c +13 -21
@@ -39,16 +39,12 @@#define S_ALIGN 1/* multiple of 2 */ struct prp_priv { -struct imx_media_dev *md;struct imx_ic_priv *ic_priv;struct media_pad pad[PRP_NUM_PADS ];/* lock to protect all members below */ struct mutex lock; -/* IPU units we require */ -struct ipu_soc *ipu; -struct v4l2_subdev *src_sd;struct v4l2_subdev *sink_sd_prpenc;struct v4l2_subdev *sink_sd_prpvf;
@@ -66,7 +62,7 @@ static inline struct prp_priv *sd_to_priv(struct v4l2_subdev *sd) {struct imx_ic_priv *ic_priv =v4l2_get_subdevdata (sd); -return ic_priv->prp_priv; +return ic_priv->task_priv; }static int prp_start (struct prp_priv *priv)
@@ -74,12 +70,10 @@ static int prp_start(struct prp_priv *priv)struct imx_ic_priv *ic_priv = priv->ic_priv;bool src_is_vdic; - priv->ipu = priv->md->ipu[ic_priv->ipu_id]; -/* set IC to receive from CSI or VDI depending on source */ src_is_vdic = !!(priv->src_sd->grp_id &IMX_MEDIA_GRP_ID_IPU_VDIC ); -ipu_set_ic_src_mux (priv->ipu, priv->csi_id, src_is_vdic); +ipu_set_ic_src_mux (ic_priv->ipu, priv->csi_id, src_is_vdic);return 0 ; }
@@ -220,12 +214,12 @@ static int prp_link_setup(struct media_entity *entity, {struct v4l2_subdev *sd =media_entity_to_v4l2_subdev (entity);struct imx_ic_priv *ic_priv =v4l2_get_subdevdata (sd); -struct prp_priv *priv = ic_priv->prp_priv; +struct prp_priv *priv = ic_priv->task_priv;struct v4l2_subdev *remote_sd;int ret =0 ; -dev_dbg (ic_priv->dev,"link setup %s -> %s" , remote->entity->name, - local->entity->name); +dev_dbg (ic_priv->ipu_dev,"%s: link setup %s -> %s" , + ic_priv->sd.name, remote->entity->name, local->entity->name); remote_sd =media_entity_to_v4l2_subdev (remote->entity);
@@ -299,7 +293,7 @@ static int prp_link_validate(struct v4l2_subdev *sd, struct v4l2_subdev_format *sink_fmt) {struct imx_ic_priv *ic_priv =v4l2_get_subdevdata (sd); -struct prp_priv *priv = ic_priv->prp_priv; +struct prp_priv *priv = ic_priv->task_priv;struct v4l2_subdev *csi;int ret;
@@ -308,7 +302,7 @@ static int prp_link_validate(struct v4l2_subdev *sd,if (ret)return ret; - csi =imx_media_find_upstream_subdev (priv->md, &ic_priv->sd.entity, + csi =imx_media_find_upstream_subdev (ic_priv->md, &ic_priv->sd.entity,IMX_MEDIA_GRP_ID_IPU_CSI );if (IS_ERR (csi)) csi =NULL ;
@@ -355,7 +349,7 @@ static int prp_link_validate(struct v4l2_subdev *sd,static int prp_s_stream (struct v4l2_subdev *sd,int enable) {struct imx_ic_priv *ic_priv =v4l2_get_subdevdata (sd); -struct prp_priv *priv = ic_priv->prp_priv; +struct prp_priv *priv = ic_priv->task_priv;int ret =0 ;mutex_lock (&priv->lock);
@@ -372,7 +366,8 @@ static int prp_s_stream(struct v4l2_subdev *sd, int enable)if (priv->stream_count != !enable) goto update_count; -dev_dbg (ic_priv->dev,"stream %s\n" , enable ?"ON" :"OFF" ); +dev_dbg (ic_priv->ipu_dev,"%s: stream %s\n" , sd->name, + enable ?"ON" :"OFF" );if (enable) ret =prp_start (priv);
@@ -444,9 +439,6 @@ static int prp_registered(struct v4l2_subdev *sd)int i, ret;u32 code; -/* get media device */ - priv->md =dev_get_drvdata (sd->v4l2_dev->dev); -for (i =0 ; i <PRP_NUM_PADS ; i++) { priv->pad[i].flags = (i ==PRP_SINK_PAD ) ?MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ;
@@ -498,12 +490,12 @@ static int prp_init(struct imx_ic_priv *ic_priv) {struct prp_priv *priv; - priv =devm_kzalloc (ic_priv->dev,sizeof (*priv),GFP_KERNEL ); + priv =devm_kzalloc (ic_priv->ipu_dev,sizeof (*priv),GFP_KERNEL );if (!priv)return -ENOMEM ;mutex_init (&priv->lock); - ic_priv->prp_priv = priv; + ic_priv->task_priv = priv; priv->ic_priv = ic_priv;return 0 ;
@@ -511,7 +503,7 @@ static int prp_init(struct imx_ic_priv *ic_priv)static void prp_remove (struct imx_ic_priv *ic_priv) { -struct prp_priv *priv = ic_priv->prp_priv; +struct prp_priv *priv = ic_priv->task_priv;mutex_destroy (&priv->lock); }
drivers/staging/media/imx/imx-ic-prpencvf.c +34 -36
222 lines not on this page · raw message
drivers/staging/media/imx/imx-ic.h +3 -4
@@ -14,11 +14,11 @@#include <media/v4l2-subdev.h> struct imx_ic_priv { -struct device *dev; +struct device *ipu_dev; +struct ipu_soc *ipu; +struct imx_media_dev *md;struct v4l2_subdev sd; -int ipu_id;int task_id; -void *prp_priv;void *task_priv; };
@@ -33,6 +33,5 @@ struct imx_ic_ops {extern struct imx_ic_ops imx_ic_prp_ops;extern struct imx_ic_ops imx_ic_prpencvf_ops; -extern struct imx_ic_ops imx_ic_pp_ops;#endif
drivers/staging/media/imx/imx-media-capture.c +4 -3
@@ -804,18 +804,19 @@ void imx_media_capture_device_unregister(struct imx_media_video_dev *vdev)EXPORT_SYMBOL_GPL (imx_media_capture_device_unregister);struct imx_media_video_dev * -imx_media_capture_device_init (struct v4l2_subdev *src_sd,int pad) +imx_media_capture_device_init (struct device *dev,struct v4l2_subdev *src_sd, +int pad) {struct capture_priv *priv;struct video_device *vfd; - priv =devm_kzalloc (src_sd->dev,sizeof (*priv),GFP_KERNEL ); + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL );if (!priv)return ERR_PTR (-ENOMEM ); priv->src_sd = src_sd; priv->src_sd_pad = pad; - priv->dev = src_sd->dev; + priv->dev = dev;mutex_init (&priv->mutex);spin_lock_init (&priv->q_lock);
drivers/staging/media/imx/imx-media-csi.c +1 -1
@@ -1987,7 +1987,7 @@ static int imx_csi_probe(struct platform_device *pdev)imx_media_grp_id_to_sd_name (priv->sd.name,sizeof (priv->sd.name), priv->sd.grp_id,ipu_get_num (priv->ipu)); - priv->vdev =imx_media_capture_device_init (&priv->sd, + priv->vdev =imx_media_capture_device_init (priv->sd.dev, &priv->sd,CSI_SRC_PAD_IDMAC );if (IS_ERR (priv->vdev))return PTR_ERR (priv->vdev);
drivers/staging/media/imx/imx-media-dev.c +12 -109
171 lines not on this page · raw message
drivers/staging/media/imx/imx-media-internal-sd.c +156 -200
487 lines not on this page · raw message
drivers/staging/media/imx/imx-media-of.c +14 -24
@@ -23,6 +23,9 @@int imx_media_of_add_csi (struct imx_media_dev *imxmd,struct device_node *csi_np) { +struct v4l2_async_subdev *asd; +int ret =0 ; +if (!of_device_is_available (csi_np)) {dev_dbg (imxmd->md.dev,"%s: %pOFn not enabled\n" , __func__, csi_np);
@@ -30,18 +33,25 @@ int imx_media_of_add_csi(struct imx_media_dev *imxmd, }/* add CSI fwnode to async notifier */ -return imx_media_add_async_subdev (imxmd,of_fwnode_handle (csi_np), -NULL ); + asd =v4l2_async_notifier_add_fwnode_subdev (&imxmd->notifier, +of_fwnode_handle (csi_np), +sizeof (*asd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); +if (ret == -EEXIST ) +dev_dbg (imxmd->md.dev,"%s: already added %pOFn\n" , + __func__, csi_np); + } + +return ret; }EXPORT_SYMBOL_GPL (imx_media_of_add_csi);int imx_media_add_of_subdevs (struct imx_media_dev *imxmd,struct device_node *np) { -bool ipu_found[2 ] = {false, false};struct device_node *csi_np;int i, ret; -u32 ipu_id;for (i =0 ; ; i++) { csi_np =of_parse_phandle (np,"ports" , i);
@@ -59,31 +69,11 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd,/* other error, can't continue */ goto err_out; } - - ret =of_alias_get_id (csi_np->parent,"ipu" ); -if (ret <0 ) - goto err_out; -if (ret >1 ) { - ret = -EINVAL ; - goto err_out; - } - - ipu_id = ret; - -if (!ipu_found[ipu_id]) { - ret =imx_media_add_ipu_internal_subdevs (imxmd, - ipu_id); -if (ret) - goto err_out; - } - - ipu_found[ipu_id] = true; }return 0 ; err_out: -imx_media_remove_ipu_internal_subdevs (imxmd);of_node_put (csi_np);return ret; }
drivers/staging/media/imx/imx-media-vdic.c +26 -59
160 lines not on this page · raw message
drivers/staging/media/imx/imx-media.h +35 -32
107 lines not on this page · raw message
drivers/staging/media/imx/imx7-media-csi.c +2 -1
@@ -1292,7 +1292,8 @@ static int imx7_csi_probe(struct platform_device *pdev) csi->sd.grp_id =IMX_MEDIA_GRP_ID_CSI ;snprintf (csi->sd.name,sizeof (csi->sd.name),"csi" ); - csi->vdev =imx_media_capture_device_init (&csi->sd,IMX7_CSI_PAD_SRC ); + csi->vdev =imx_media_capture_device_init (csi->sd.dev, &csi->sd, +IMX7_CSI_PAD_SRC );if (IS_ERR (csi->vdev))return PTR_ERR (csi->vdev);
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v5 3/9 media: staging/imx: Pass device to alloc/free_dma_buf
In reply to Steve LongerbeamAllocate and free a DMA coherent buffer in imx_media_alloc/free_dma_buf() from the given device. This allows DMA alloc and free using a device that is backed by real hardware, which for the imx5/6/7 CSI is the CSI unit, and for the internal IPU sub-devices, is the parent IPU.
--- drivers/staging/media/imx/imx-ic-prpencvf.c | 18 +++++++++--------- drivers/staging/media/imx/imx-media-csi.c | 6 +++--- drivers/staging/media/imx/imx-media-utils.c | 13 ++++++------- drivers/staging/media/imx/imx-media.h | 4 ++-- drivers/staging/media/imx/imx7-media-csi.c | 4 ++-- 5 files changed, 22 insertions(+), 23 deletions(-)
drivers/staging/media/imx/imx-ic-prpencvf.c +9 -9
@@ -464,13 +464,13 @@ static int prp_setup_rotation(struct prp_priv *priv) incc = priv->cc[PRPENCVF_SINK_PAD ]; outcc = vdev->cc; - ret =imx_media_alloc_dma_buf (ic_priv->md, &priv->rot_buf[0 ], + ret =imx_media_alloc_dma_buf (ic_priv->ipu_dev, &priv->rot_buf[0 ], outfmt->sizeimage);if (ret) {v4l2_err (&ic_priv->sd,"failed to alloc rot_buf[0], %d\n" , ret);return ret; } - ret =imx_media_alloc_dma_buf (ic_priv->md, &priv->rot_buf[1 ], + ret =imx_media_alloc_dma_buf (ic_priv->ipu_dev, &priv->rot_buf[1 ], outfmt->sizeimage);if (ret) {v4l2_err (&ic_priv->sd,"failed to alloc rot_buf[1], %d\n" , ret);
@@ -543,9 +543,9 @@ static int prp_setup_rotation(struct prp_priv *priv) unsetup_vb2:prp_unsetup_vb2_buf (priv,VB2_BUF_STATE_QUEUED ); free_rot1: -imx_media_free_dma_buf (ic_priv->md, &priv->rot_buf[1 ]); +imx_media_free_dma_buf (ic_priv->ipu_dev, &priv->rot_buf[1 ]); free_rot0: -imx_media_free_dma_buf (ic_priv->md, &priv->rot_buf[0 ]); +imx_media_free_dma_buf (ic_priv->ipu_dev, &priv->rot_buf[0 ]);return ret; }
@@ -563,8 +563,8 @@ static void prp_unsetup_rotation(struct prp_priv *priv)ipu_ic_disable (priv->ic); -imx_media_free_dma_buf (ic_priv->md, &priv->rot_buf[0 ]); -imx_media_free_dma_buf (ic_priv->md, &priv->rot_buf[1 ]); +imx_media_free_dma_buf (ic_priv->ipu_dev, &priv->rot_buf[0 ]); +imx_media_free_dma_buf (ic_priv->ipu_dev, &priv->rot_buf[1 ]); }static int prp_setup_norotation (struct prp_priv *priv)
@@ -656,7 +656,7 @@ static int prp_start(struct prp_priv *priv) outfmt = &vdev->fmt.fmt.pix; - ret =imx_media_alloc_dma_buf (ic_priv->md, &priv->underrun_buf, + ret =imx_media_alloc_dma_buf (ic_priv->ipu_dev, &priv->underrun_buf, outfmt->sizeimage);if (ret) goto out_put_ipu;
@@ -726,7 +726,7 @@ static int prp_start(struct prp_priv *priv) out_unsetup:prp_unsetup (priv,VB2_BUF_STATE_QUEUED ); out_free_underrun: -imx_media_free_dma_buf (ic_priv->md, &priv->underrun_buf); +imx_media_free_dma_buf (ic_priv->ipu_dev, &priv->underrun_buf); out_put_ipu:prp_put_ipu_resources (priv);return ret;
@@ -763,7 +763,7 @@ static void prp_stop(struct prp_priv *priv)prp_unsetup (priv,VB2_BUF_STATE_ERROR ); -imx_media_free_dma_buf (ic_priv->md, &priv->underrun_buf); +imx_media_free_dma_buf (ic_priv->ipu_dev, &priv->underrun_buf);/* cancel the EOF timeout timer */ del_timer_sync (&priv->eof_timeout_timer);
drivers/staging/media/imx/imx-media-csi.c +3 -3
@@ -612,7 +612,7 @@ static int csi_idmac_start(struct csi_priv *priv) outfmt = &vdev->fmt.fmt.pix; - ret =imx_media_alloc_dma_buf (priv->md, &priv->underrun_buf, + ret =imx_media_alloc_dma_buf (priv->dev, &priv->underrun_buf, outfmt->sizeimage);if (ret) goto out_put_ipu;
@@ -666,7 +666,7 @@ static int csi_idmac_start(struct csi_priv *priv) out_unsetup:csi_idmac_unsetup (priv,VB2_BUF_STATE_QUEUED ); out_free_dma_buf: -imx_media_free_dma_buf (priv->md, &priv->underrun_buf); +imx_media_free_dma_buf (priv->dev, &priv->underrun_buf); out_put_ipu:csi_idmac_put_ipu_resources (priv);return ret;
@@ -698,7 +698,7 @@ static void csi_idmac_stop(struct csi_priv *priv)csi_idmac_unsetup (priv,VB2_BUF_STATE_ERROR ); -imx_media_free_dma_buf (priv->md, &priv->underrun_buf); +imx_media_free_dma_buf (priv->dev, &priv->underrun_buf);/* cancel the EOF timeout timer */ del_timer_sync (&priv->eof_timeout_timer);
drivers/staging/media/imx/imx-media-utils.c +6 -7
@@ -679,29 +679,28 @@ int imx_media_ipu_image_to_mbus_fmt(struct v4l2_mbus_framefmt *mbus, }EXPORT_SYMBOL_GPL (imx_media_ipu_image_to_mbus_fmt); -void imx_media_free_dma_buf (struct imx_media_dev *imxmd, +void imx_media_free_dma_buf (struct device *dev,struct imx_media_dma_buf *buf) {if (buf->virt) -dma_free_coherent (imxmd->md.dev, buf->len, - buf->virt, buf->phys); +dma_free_coherent (dev, buf->len, buf->virt, buf->phys); buf->virt =NULL ; buf->phys =0 ; }EXPORT_SYMBOL_GPL (imx_media_free_dma_buf); -int imx_media_alloc_dma_buf (struct imx_media_dev *imxmd, +int imx_media_alloc_dma_buf (struct device *dev,struct imx_media_dma_buf *buf,int size) { -imx_media_free_dma_buf (imxmd, buf); +imx_media_free_dma_buf (dev, buf); buf->len =PAGE_ALIGN (size); - buf->virt =dma_alloc_coherent (imxmd->md.dev, buf->len, &buf->phys, + buf->virt =dma_alloc_coherent (dev, buf->len, &buf->phys,GFP_DMA |GFP_KERNEL );if (!buf->virt) { -dev_err (imxmd->md.dev,"failed to alloc dma buffer\n" ); +dev_err (dev,"%s: failed\n" , __func__);return -ENOMEM ; }
drivers/staging/media/imx/imx-media.h +2 -2
@@ -208,9 +208,9 @@ struct imx_media_dma_buf {unsigned long len; }; -void imx_media_free_dma_buf (struct imx_media_dev *imxmd, +void imx_media_free_dma_buf (struct device *dev,struct imx_media_dma_buf *buf); -int imx_media_alloc_dma_buf (struct imx_media_dev *imxmd, +int imx_media_alloc_dma_buf (struct device *dev,struct imx_media_dma_buf *buf,int size);
drivers/staging/media/imx/imx7-media-csi.c +2 -2
@@ -714,7 +714,7 @@ static int imx7_csi_dma_start(struct imx7_csi *csi)struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;int ret; - ret =imx_media_alloc_dma_buf (csi->imxmd, &csi->underrun_buf, + ret =imx_media_alloc_dma_buf (csi->dev, &csi->underrun_buf, out_pix->sizeimage);if (ret <0 ) {v4l2_warn (&csi->sd,"consider increasing the CMA area\n" );
@@ -754,7 +754,7 @@ static void imx7_csi_dma_stop(struct imx7_csi *csi)imx7_csi_dma_unsetup_vb2_buf (csi,VB2_BUF_STATE_ERROR ); -imx_media_free_dma_buf (csi->imxmd, &csi->underrun_buf); +imx_media_free_dma_buf (csi->dev, &csi->underrun_buf); }static int imx7_csi_configure (struct imx7_csi *csi)
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v5 4/9 media: staging/imx: Move add_video_device into capture_device_register
In reply to Steve LongerbeamMove imx_media_add_video_device() into imx_media_capture_device_register(). Also the former has no error conditions to convert to void.
--- drivers/staging/media/imx/imx-ic-prpencvf.c | 5 ----- drivers/staging/media/imx/imx-media-capture.c | 3 +++ drivers/staging/media/imx/imx-media-csi.c | 7 +------ drivers/staging/media/imx/imx-media-utils.c | 9 ++++----- drivers/staging/media/imx/imx-media.h | 4 ++-- drivers/staging/media/imx/imx7-media-csi.c | 12 +----------- 6 files changed, 11 insertions(+), 29 deletions(-)
drivers/staging/media/imx/imx-ic-prpencvf.c +0 -5
@@ -1241,7 +1241,6 @@ static int prp_s_frame_interval(struct v4l2_subdev *sd,static int prp_registered (struct v4l2_subdev *sd) {struct prp_priv *priv =sd_to_priv (sd); -struct imx_ic_priv *ic_priv = priv->ic_priv;int i, ret;u32 code;
@@ -1271,10 +1270,6 @@ static int prp_registered(struct v4l2_subdev *sd)if (ret)return ret; - ret =imx_media_add_video_device (ic_priv->md, priv->vdev); -if (ret) - goto unreg; - ret =prp_init_controls (priv);if (ret) goto unreg;
drivers/staging/media/imx/imx-media-capture.c +3 -0
@@ -780,6 +780,9 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) vfd->ctrl_handler = &priv->ctrl_hdlr; +/* add vdev to the video device list */ +imx_media_add_video_device (priv->md, vdev); +return 0 ; unreg:video_unregister_device (vfd);
drivers/staging/media/imx/imx-media-csi.c +1 -6
@@ -1820,13 +1820,8 @@ static int csi_registered(struct v4l2_subdev *sd)if (ret) goto free_fim; - ret =imx_media_add_video_device (priv->md, priv->vdev); -if (ret) - goto unreg; -return 0 ; -unreg: -imx_media_capture_device_unregister (priv->vdev); + free_fim:if (priv->fim)imx_media_fim_free (priv->fim);
drivers/staging/media/imx/imx-media-utils.c +4 -5
@@ -767,18 +767,17 @@ imx_media_find_subdev_by_devname(struct imx_media_dev *imxmd,EXPORT_SYMBOL_GPL (imx_media_find_subdev_by_devname);/* -* Adds a video device to the master video device list. This is called by -* an async subdev that owns a video device when it is registered. +* Adds a video device to the master video device list. This is called +* when a video device is registered. */ -int imx_media_add_video_device (struct imx_media_dev *imxmd, -struct imx_media_video_dev *vdev) +void imx_media_add_video_device (struct imx_media_dev *imxmd, +struct imx_media_video_dev *vdev) {mutex_lock (&imxmd->mutex);list_add_tail (&vdev->list, &imxmd->vdev_list);mutex_unlock (&imxmd->mutex); -return 0 ; }EXPORT_SYMBOL_GPL (imx_media_add_video_device);
drivers/staging/media/imx/imx-media.h +2 -2
@@ -189,8 +189,8 @@ imx_media_find_subdev_by_fwnode(struct imx_media_dev *imxmd,struct v4l2_subdev *imx_media_find_subdev_by_devname (struct imx_media_dev *imxmd,const char *devname); -int imx_media_add_video_device (struct imx_media_dev *imxmd, -struct imx_media_video_dev *vdev); +void imx_media_add_video_device (struct imx_media_dev *imxmd, +struct imx_media_video_dev *vdev);int imx_media_find_mipi_csi2_channel (struct imx_media_dev *imxmd,struct media_entity *start_entity); struct media_pad *
drivers/staging/media/imx/imx7-media-csi.c +1 -11
@@ -1126,17 +1126,7 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)if (ret <0 )return ret; - ret =imx_media_capture_device_register (csi->vdev); -if (ret <0 ) -return ret; - - ret =imx_media_add_video_device (csi->imxmd, csi->vdev); -if (ret <0 ) { -imx_media_capture_device_unregister (csi->vdev); -return ret; - } - -return 0 ; +return imx_media_capture_device_register (csi->vdev); }static void imx7_csi_unregistered (struct v4l2_subdev *sd)
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v5 5/9 Revert "media: imx: Set capture compose rectangle in capture_device_set_format"
In reply to Steve LongerbeamRvert this commit, as imx_media_capture_device_set_format() will be removed. The arguments to mx_media_mbus_fmt_to_pix_fmt() and imx_media_capture_device_set_format() in imx7_csi_set_fmt() are also reverted.
This reverts commit 5964cbd8692252615370b77eb96764dd70c2f837.
---
Chnges in v3:
- revert to previous args in imx7_csi_set_fmt().
--- drivers/staging/media/imx/imx-ic-prpencvf.c | 5 ++-- drivers/staging/media/imx/imx-media-capture.c | 24 +++++++++---------- drivers/staging/media/imx/imx-media-csi.c | 5 ++-- drivers/staging/media/imx/imx-media-utils.c | 20 ++++------------ drivers/staging/media/imx/imx-media.h | 6 ++--- drivers/staging/media/imx/imx7-media-csi.c | 5 ++-- 6 files changed, 25 insertions(+), 40 deletions(-)
drivers/staging/media/imx/imx-ic-prpencvf.c +2 -3
@@ -910,7 +910,6 @@ static int prp_set_fmt(struct v4l2_subdev *sd,const struct imx_media_pixfmt *cc;struct v4l2_pix_format vdev_fmt;struct v4l2_mbus_framefmt *fmt; -struct v4l2_rect vdev_compose;int ret =0 ;if (sdformat->pad >=PRPENCVF_NUM_PADS )
@@ -952,11 +951,11 @@ static int prp_set_fmt(struct v4l2_subdev *sd, priv->cc[sdformat->pad] = cc;/* propagate output pad format to capture device */ -imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, &vdev_compose, +imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, &priv->format_mbus[PRPENCVF_SRC_PAD ], priv->cc[PRPENCVF_SRC_PAD ]);mutex_unlock (&priv->lock); -imx_media_capture_device_set_format (vdev, &vdev_fmt, &vdev_compose); +imx_media_capture_device_set_format (vdev, &vdev_fmt);return 0 ; out:
drivers/staging/media/imx/imx-media-capture.c +12 -12
@@ -205,8 +205,7 @@ static int capture_g_fmt_vid_cap(struct file *file, void *fh,static int __capture_try_fmt_vid_cap (struct capture_priv *priv,struct v4l2_subdev_format *fmt_src, -struct v4l2_format *f, -struct v4l2_rect *compose) +struct v4l2_format *f) {const struct imx_media_pixfmt *cc, *cc_src;
@@ -246,8 +245,7 @@ static int __capture_try_fmt_vid_cap(struct capture_priv *priv, } } -imx_media_mbus_fmt_to_pix_fmt (&f->fmt.pix, compose, - &fmt_src->format, cc); +imx_media_mbus_fmt_to_pix_fmt (&f->fmt.pix, &fmt_src->format, cc);return 0 ; }
@@ -265,7 +263,7 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh,if (ret)return ret; -return __capture_try_fmt_vid_cap (priv, &fmt_src, f,NULL ); +return __capture_try_fmt_vid_cap (priv, &fmt_src, f); } static int capture_s_fmt_vid_cap(struct file *file, void *fh,
@@ -273,7 +271,6 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, {struct capture_priv *priv =video_drvdata (file);struct v4l2_subdev_format fmt_src; -struct v4l2_rect compose;int ret;if (vb2_is_busy (&priv->q)) {
@@ -287,14 +284,17 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh,if (ret)return ret; - ret =__capture_try_fmt_vid_cap (priv, &fmt_src, f, &compose); + ret =__capture_try_fmt_vid_cap (priv, &fmt_src, f);if (ret)return ret; priv->vdev.fmt.fmt.pix = f->fmt.pix; priv->vdev.cc =imx_media_find_format (f->fmt.pix.pixelformat,CS_SEL_ANY , true); - priv->vdev.compose = compose; + priv->vdev.compose.left =0 ; + priv->vdev.compose.top =0 ; + priv->vdev.compose.width = fmt_src.format.width; + priv->vdev.compose.height = fmt_src.format.height;return 0 ; }
@@ -655,8 +655,7 @@ static struct video_device capture_videodev = { };void imx_media_capture_device_set_format (struct imx_media_video_dev *vdev, -const struct v4l2_pix_format *pix, -const struct v4l2_rect *compose) +struct v4l2_pix_format *pix) {struct capture_priv *priv =to_capture_priv (vdev);
@@ -664,7 +663,6 @@ void imx_media_capture_device_set_format(struct imx_media_video_dev *vdev, priv->vdev.fmt.fmt.pix = *pix; priv->vdev.cc =imx_media_find_format (pix->pixelformat,CS_SEL_ANY , true); - priv->vdev.compose = *compose;mutex_unlock (&priv->mutex); }EXPORT_SYMBOL_GPL (imx_media_capture_device_set_format);
@@ -770,8 +768,10 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) } vdev->fmt.type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; -imx_media_mbus_fmt_to_pix_fmt (&vdev->fmt.fmt.pix, &vdev->compose, +imx_media_mbus_fmt_to_pix_fmt (&vdev->fmt.fmt.pix, &fmt_src.format,NULL ); + vdev->compose.width = fmt_src.format.width; + vdev->compose.height = fmt_src.format.height; vdev->cc =imx_media_find_format (vdev->fmt.fmt.pix.pixelformat,CS_SEL_ANY , false);
drivers/staging/media/imx/imx-media-csi.c +2 -3
@@ -1512,7 +1512,6 @@ static int csi_set_fmt(struct v4l2_subdev *sd,struct v4l2_pix_format vdev_fmt;struct v4l2_mbus_framefmt *fmt;struct v4l2_rect *crop, *compose; -struct v4l2_rect vdev_compose;int ret;if (sdformat->pad >=CSI_NUM_PADS )
@@ -1568,11 +1567,11 @@ static int csi_set_fmt(struct v4l2_subdev *sd, priv->cc[sdformat->pad] = cc;/* propagate IDMAC output pad format to capture device */ -imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, &vdev_compose, +imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, &priv->format_mbus[CSI_SRC_PAD_IDMAC ], priv->cc[CSI_SRC_PAD_IDMAC ]);mutex_unlock (&priv->lock); -imx_media_capture_device_set_format (vdev, &vdev_fmt, &vdev_compose); +imx_media_capture_device_set_format (vdev, &vdev_fmt);return 0 ; out:
drivers/staging/media/imx/imx-media-utils.c +5 -15
@@ -577,8 +577,7 @@ void imx_media_fill_default_mbus_fields(struct v4l2_mbus_framefmt *tryfmt,EXPORT_SYMBOL_GPL (imx_media_fill_default_mbus_fields);int imx_media_mbus_fmt_to_pix_fmt (struct v4l2_pix_format *pix, -struct v4l2_rect *compose, -const struct v4l2_mbus_framefmt *mbus, +struct v4l2_mbus_framefmt *mbus,const struct imx_media_pixfmt *cc) {u32 width;
@@ -625,17 +624,6 @@ int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, pix->sizeimage = cc->planar ? ((stride * pix->height * cc->bpp) >>3 ) : stride * pix->height; -/* -* set capture compose rectangle, which is fixed to the -* source subdevice mbus format. -*/ -if (compose) { - compose->left =0 ; - compose->top =0 ; - compose->width = mbus->width; - compose->height = mbus->height; - } -return 0 ; }EXPORT_SYMBOL_GPL (imx_media_mbus_fmt_to_pix_fmt);
@@ -647,11 +635,13 @@ int imx_media_mbus_fmt_to_ipu_image(struct ipu_image *image,memset (image,0 ,sizeof (*image)); - ret =imx_media_mbus_fmt_to_pix_fmt (&image->pix, &image->rect, - mbus,NULL ); + ret =imx_media_mbus_fmt_to_pix_fmt (&image->pix, mbus,NULL );if (ret)return ret; + image->rect.width = mbus->width; + image->rect.height = mbus->height; +return 0 ; }EXPORT_SYMBOL_GPL (imx_media_mbus_fmt_to_ipu_image);
drivers/staging/media/imx/imx-media.h +2 -4
@@ -174,8 +174,7 @@ void imx_media_fill_default_mbus_fields(struct v4l2_mbus_framefmt *tryfmt,struct v4l2_mbus_framefmt *fmt, bool ic_route);int imx_media_mbus_fmt_to_pix_fmt (struct v4l2_pix_format *pix, -struct v4l2_rect *compose, -const struct v4l2_mbus_framefmt *mbus, +struct v4l2_mbus_framefmt *mbus,const struct imx_media_pixfmt *cc);int imx_media_mbus_fmt_to_ipu_image (struct ipu_image *image,struct v4l2_mbus_framefmt *mbus);
@@ -280,8 +279,7 @@ void imx_media_capture_device_unregister(struct imx_media_video_dev *vdev);struct imx_media_buffer *imx_media_capture_device_next_buf (struct imx_media_video_dev *vdev);void imx_media_capture_device_set_format (struct imx_media_video_dev *vdev, -const struct v4l2_pix_format *pix, -const struct v4l2_rect *compose); +struct v4l2_pix_format *pix);void imx_media_capture_device_error (struct imx_media_video_dev *vdev);/* subdev group ids */
drivers/staging/media/imx/imx7-media-csi.c +2 -3
@@ -1035,7 +1035,6 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd,const struct imx_media_pixfmt *outcc;struct v4l2_mbus_framefmt *outfmt;struct v4l2_pix_format vdev_fmt; -struct v4l2_rect vdev_compose;const struct imx_media_pixfmt *cc;struct v4l2_mbus_framefmt *fmt;struct v4l2_subdev_format format;
@@ -1086,11 +1085,11 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd, csi->cc[sdformat->pad] = cc;/* propagate output pad format to capture device */ -imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, &vdev_compose, +imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, &csi->format_mbus[IMX7_CSI_PAD_SRC ], csi->cc[IMX7_CSI_PAD_SRC ]);mutex_unlock (&csi->lock); -imx_media_capture_device_set_format (vdev, &vdev_fmt, &vdev_compose); +imx_media_capture_device_set_format (vdev, &vdev_fmt);return 0 ;
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Steve Longerbeam
maintainerPATCH v5 6/9 media: staging/imx: Remove capture_device_set_format
In reply to Steve LongerbeamDon't propagate the source pad format to the connected capture device. It's now the responsibility of userspace to call VIDIOC_S_FMT on the capture device to ensure the capture format and compose rectangle are compatible with the connected source. To check this, validate the capture format with the source before streaming starts.
---
Changes in v4:
- add **cc arg to __capture_try_fmt_vid_cap() to validate colorspace, instead of calling ipu_pixelformat_to_colorspace().
- add error message if capture format validation failed.
--- drivers/staging/media/imx/imx-ic-prpencvf.c | 16 +---- drivers/staging/media/imx/imx-media-capture.c | 71 +++++++++++++------ drivers/staging/media/imx/imx-media-csi.c | 16 +---- drivers/staging/media/imx/imx-media.h | 2 - drivers/staging/media/imx/imx7-media-csi.c | 17 +---- 5 files changed, 55 insertions(+), 67 deletions(-)
drivers/staging/media/imx/imx-ic-prpencvf.c +2 -14
@@ -906,9 +906,7 @@ static int prp_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_format *sdformat) {struct prp_priv *priv =sd_to_priv (sd); -struct imx_media_video_dev *vdev = priv->vdev;const struct imx_media_pixfmt *cc; -struct v4l2_pix_format vdev_fmt;struct v4l2_mbus_framefmt *fmt;int ret =0 ;
@@ -945,19 +943,9 @@ static int prp_set_fmt(struct v4l2_subdev *sd, priv->cc[PRPENCVF_SRC_PAD ] = outcc; } -if (sdformat->which ==V4L2_SUBDEV_FORMAT_TRY ) - goto out; - - priv->cc[sdformat->pad] = cc; +if (sdformat->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) + priv->cc[sdformat->pad] = cc; -/* propagate output pad format to capture device */ -imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, - &priv->format_mbus[PRPENCVF_SRC_PAD ], - priv->cc[PRPENCVF_SRC_PAD ]); -mutex_unlock (&priv->lock); -imx_media_capture_device_set_format (vdev, &vdev_fmt); - -return 0 ; out:mutex_unlock (&priv->lock);return ret;
drivers/staging/media/imx/imx-media-capture.c +49 -22
117 lines not on this page · raw message
drivers/staging/media/imx/imx-media-csi.c +2 -14
@@ -1506,10 +1506,8 @@ static int csi_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_format *sdformat) {struct csi_priv *priv =v4l2_get_subdevdata (sd); -struct imx_media_video_dev *vdev = priv->vdev;struct v4l2_fwnode_endpoint upstream_ep = { .bus_type =0 };const struct imx_media_pixfmt *cc; -struct v4l2_pix_format vdev_fmt;struct v4l2_mbus_framefmt *fmt;struct v4l2_rect *crop, *compose;int ret;
@@ -1561,19 +1559,9 @@ static int csi_set_fmt(struct v4l2_subdev *sd, } } -if (sdformat->which ==V4L2_SUBDEV_FORMAT_TRY ) - goto out; - - priv->cc[sdformat->pad] = cc; +if (sdformat->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) + priv->cc[sdformat->pad] = cc; -/* propagate IDMAC output pad format to capture device */ -imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, - &priv->format_mbus[CSI_SRC_PAD_IDMAC ], - priv->cc[CSI_SRC_PAD_IDMAC ]); -mutex_unlock (&priv->lock); -imx_media_capture_device_set_format (vdev, &vdev_fmt); - -return 0 ; out:mutex_unlock (&priv->lock);return ret;
drivers/staging/media/imx/imx-media.h +0 -2
@@ -278,8 +278,6 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev);void imx_media_capture_device_unregister (struct imx_media_video_dev *vdev);struct imx_media_buffer *imx_media_capture_device_next_buf (struct imx_media_video_dev *vdev); -void imx_media_capture_device_set_format (struct imx_media_video_dev *vdev, -struct v4l2_pix_format *pix);void imx_media_capture_device_error (struct imx_media_video_dev *vdev);/* subdev group ids */
drivers/staging/media/imx/imx7-media-csi.c +2 -15
@@ -1031,10 +1031,8 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_format *sdformat) {struct imx7_csi *csi =v4l2_get_subdevdata (sd); -struct imx_media_video_dev *vdev = csi->vdev;const struct imx_media_pixfmt *outcc;struct v4l2_mbus_framefmt *outfmt; -struct v4l2_pix_format vdev_fmt;const struct imx_media_pixfmt *cc;struct v4l2_mbus_framefmt *fmt;struct v4l2_subdev_format format;
@@ -1079,19 +1077,8 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd, csi->cc[IMX7_CSI_PAD_SRC ] = outcc; } -if (sdformat->which ==V4L2_SUBDEV_FORMAT_TRY ) - goto out_unlock; - - csi->cc[sdformat->pad] = cc; - -/* propagate output pad format to capture device */ -imx_media_mbus_fmt_to_pix_fmt (&vdev_fmt, - &csi->format_mbus[IMX7_CSI_PAD_SRC ], - csi->cc[IMX7_CSI_PAD_SRC ]); -mutex_unlock (&csi->lock); -imx_media_capture_device_set_format (vdev, &vdev_fmt); - -return 0 ; +if (sdformat->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) + csi->cc[sdformat->pad] = cc; out_unlock:mutex_unlock (&csi->lock);
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v5 7/9 media: staging/imx: Re-organize modules
In reply to Steve LongerbeamRe-organize modules, and which objects are linked into those modules, so that:
- imx6-media (renamed from imx-media) is the media driver module for imx5/6 only, and has no symbol exports.
- imx6-media-csi (renamed from imx-media-csi) is the subdev driver module for imx5/6 CSI. It is now linked direcly with imx-media-fim, since only the imx5/6 CSI makes use of the frame interval monitor.
- imx-media-common now only contains common code between imx5/6 and imx7 media drivers. It contains imx-media-utils, imx-media-of, imx-media-dev-common, and imx-media-capture. In order to acheive that, some functions common to imx5/6 and imx7 have been moved out of imx-media-dev.c and into imx-media-dev-common.c.
--- drivers/staging/media/imx/Makefile | 14 +- .../staging/media/imx/imx-media-dev-common.c | 345 +++++++++++++++++- drivers/staging/media/imx/imx-media-dev.c | 340 +---------------- drivers/staging/media/imx/imx-media-fim.c | 5 - drivers/staging/media/imx/imx-media-of.c | 3 + drivers/staging/media/imx/imx-media.h | 16 +- drivers/staging/media/imx/imx7-media-csi.c | 4 +- 7 files changed, 369 insertions(+), 358 deletions(-)
drivers/staging/media/imx/Makefile +8 -6
@@ -1,14 +1,16 @@ # SPDX-License-Identifier: GPL-2.0 -imx-media-objs := imx-media-dev.o imx-media-internal-sd.o imx-media-of.o \ +imx6-media-objs := imx-media-dev.o imx-media-internal-sd.o \ imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o imx-media-vdic.o -imx-media-objs += imx-media-dev-common.o -imx-media-common-objs := imx-media-utils.o imx-media-fim.o -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media.o +imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \ + imx-media-of.o imx-media-utils.o + +imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o + +obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-capture.o -obj-$(CONFIG_VIDEO_IMX_CSI) += imx-media-csi.o +obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
drivers/staging/media/imx/imx-media-dev-common.c +340 -5
377 lines not on this page · raw message
drivers/staging/media/imx/imx-media-dev.c +11 -329
381 lines not on this page · raw message
drivers/staging/media/imx/imx-media-fim.c +0 -5
@@ -420,7 +420,6 @@ void imx_media_fim_eof_monitor(struct imx_media_fim *fim, ktime_t timestamp)spin_unlock_irqrestore (&fim->lock, flags); } -EXPORT_SYMBOL_GPL (imx_media_fim_eof_monitor);/* Called by the subdev in its s_stream callback */ int imx_media_fim_set_stream(struct imx_media_fim *fim,
@@ -457,7 +456,6 @@ int imx_media_fim_set_stream(struct imx_media_fim *fim,v4l2_ctrl_unlock (fim->ctrl[FIM_CL_ENABLE ]);return ret; } -EXPORT_SYMBOL_GPL (imx_media_fim_set_stream);int imx_media_fim_add_controls (struct imx_media_fim *fim) {
@@ -465,7 +463,6 @@ int imx_media_fim_add_controls(struct imx_media_fim *fim)return v4l2_ctrl_add_handler (fim->sd->ctrl_handler, &fim->ctrl_handler,NULL , false); } -EXPORT_SYMBOL_GPL (imx_media_fim_add_controls);/* Called by the subdev in its subdev registered callback */ struct imx_media_fim *imx_media_fim_init (struct v4l2_subdev *sd)
@@ -489,10 +486,8 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd)return fim; } -EXPORT_SYMBOL_GPL (imx_media_fim_init);void imx_media_fim_free (struct imx_media_fim *fim) {v4l2_ctrl_handler_free (&fim->ctrl_handler); } -EXPORT_SYMBOL_GPL (imx_media_fim_free);
drivers/staging/media/imx/imx-media-of.c +3 -0
@@ -77,6 +77,7 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd,of_node_put (csi_np);return ret; } +EXPORT_SYMBOL_GPL (imx_media_add_of_subdevs);/* * Create a single media link to/from sd using a fwnode link.
@@ -146,6 +147,7 @@ int imx_media_create_of_links(struct imx_media_dev *imxmd,return 0 ; } +EXPORT_SYMBOL_GPL (imx_media_create_of_links);/* * Create media links to the given CSI subdevice's sink pads,
@@ -189,3 +191,4 @@ int imx_media_create_csi_of_links(struct imx_media_dev *imxmd,return 0 ; } +EXPORT_SYMBOL_GPL (imx_media_create_csi_of_links);
drivers/staging/media/imx/imx-media.h +5 -11
@@ -217,18 +217,12 @@ int imx_media_pipeline_set_stream(struct imx_media_dev *imxmd,struct media_entity *entity, bool on); -/* imx-media-dev.c */ -int imx_media_subdev_bound (struct v4l2_async_notifier *notifier, -struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd); -int imx_media_link_notify (struct media_link *link,u32 flags, -unsigned int notification); -void imx_media_notify (struct v4l2_subdev *sd,unsigned int notification, -void *arg); +/* imx-media-dev-common.c */ int imx_media_probe_complete (struct v4l2_async_notifier *notifier); - -struct imx_media_dev *imx_media_dev_init (struct device *dev); -int imx_media_dev_notifier_register (struct imx_media_dev *imxmd); +struct imx_media_dev *imx_media_dev_init (struct device *dev, +const struct media_device_ops *ops); +int imx_media_dev_notifier_register (struct imx_media_dev *imxmd, +const struct v4l2_async_notifier_operations *ops);/* imx-media-fim.c */ struct imx_media_fim ;
drivers/staging/media/imx/imx7-media-csi.c +2 -2
@@ -1241,7 +1241,7 @@ static int imx7_csi_probe(struct platform_device *pdev) }/* add media device */ - imxmd =imx_media_dev_init (dev); + imxmd =imx_media_dev_init (dev,NULL );if (IS_ERR (imxmd)) { ret =PTR_ERR (imxmd); goto destroy_mutex;
@@ -1252,7 +1252,7 @@ static int imx7_csi_probe(struct platform_device *pdev)if (ret <0 && ret != -ENODEV && ret != -EEXIST ) goto cleanup; - ret =imx_media_dev_notifier_register (imxmd); + ret =imx_media_dev_notifier_register (imxmd,NULL );if (ret <0 ) goto cleanup;
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v5 8/9 media: staging/imx: Improve pipeline searching
In reply to Steve LongerbeamExport find_pipeline_pad(), renaming to imx_media_pipeline_pad(), and extend its functionality to allow searching for video devices in the enabled pipeline in addition to sub-devices.
As part of this:
- Rename imx_media_find_mipi_csi2_channel() to
imx_media_pipeline_csi2_channel().
- Remove imx_media_find_upstream_pad(), it is redundant now.
- Rename imx_media_find_upstream_subdev() to imx_media_pipeline_subdev() with an additional boolean argument for searching upstream or downstream.
- Add imx_media_pipeline_video_device() which is analogous to imx_media_pipeline_subdev() but searches for video devices.
- Remove imxmd pointer arg from all of the functions above, it was never used in those functions. With that change the i.MX5/6 CSI, VDIC, and IC sub-devices no longer require the media_device.
--- drivers/staging/media/imx/imx-ic-common.c | 4 +- drivers/staging/media/imx/imx-ic-prp.c | 4 +- drivers/staging/media/imx/imx-ic.h | 1 - drivers/staging/media/imx/imx-media-csi.c | 13 +- drivers/staging/media/imx/imx-media-fim.c | 4 - .../staging/media/imx/imx-media-internal-sd.c | 5 +- drivers/staging/media/imx/imx-media-utils.c | 128 ++++++++++-------- drivers/staging/media/imx/imx-media-vdic.c | 5 +- drivers/staging/media/imx/imx-media.h | 20 +-- drivers/staging/media/imx/imx7-media-csi.c | 2 +- 10 files changed, 93 insertions(+), 93 deletions(-)
drivers/staging/media/imx/imx-ic-common.c +1 -3
@@ -22,12 +22,11 @@ static struct imx_ic_ops *ic_ops[IC_NUM_OPS] = { [IC_TASK_VIEWFINDER] = &imx_ic_prpencvf_ops, }; -struct v4l2_subdev *imx_media_ic_register (struct imx_media_dev *imxmd, +struct v4l2_subdev *imx_media_ic_register (struct v4l2_device *v4l2_dev,struct device *ipu_dev,struct ipu_soc *ipu,u32 grp_id) { -struct v4l2_device *v4l2_dev = &imxmd->v4l2_dev;struct imx_ic_priv *priv;int ret;
@@ -37,7 +36,6 @@ struct v4l2_subdev *imx_media_ic_register(struct imx_media_dev *imxmd, priv->ipu_dev = ipu_dev; priv->ipu = ipu; - priv->md = imxmd;/* get our IC task id */ switch (grp_id) {
drivers/staging/media/imx/imx-ic-prp.c +2 -2
@@ -302,8 +302,8 @@ static int prp_link_validate(struct v4l2_subdev *sd,if (ret)return ret; - csi =imx_media_find_upstream_subdev (ic_priv->md, &ic_priv->sd.entity, -IMX_MEDIA_GRP_ID_IPU_CSI ); + csi =imx_media_pipeline_subdev (&ic_priv->sd.entity, +IMX_MEDIA_GRP_ID_IPU_CSI , true);if (IS_ERR (csi)) csi =NULL ;
drivers/staging/media/imx/imx-ic.h +0 -1
@@ -16,7 +16,6 @@struct imx_ic_priv {struct device *ipu_dev;struct ipu_soc *ipu; -struct imx_media_dev *md;struct v4l2_subdev sd;int task_id;void *task_priv;
drivers/staging/media/imx/imx-media-csi.c +4 -9
@@ -60,7 +60,6 @@ struct csi_skip_desc {struct csi_priv {struct device *dev;struct ipu_soc *ipu; -struct imx_media_dev *md;struct v4l2_subdev sd;struct media_pad pad[CSI_NUM_PADS ];/* the video device at IDMAC output pad */
@@ -182,8 +181,8 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv,* CSI-2 receiver if it is in the path, otherwise stay * with video mux. */ - sd =imx_media_find_upstream_subdev (priv->md, src, -IMX_MEDIA_GRP_ID_CSI2 ); + sd =imx_media_pipeline_subdev (src,IMX_MEDIA_GRP_ID_CSI2 , + true);if (!IS_ERR (sd)) src = &sd->entity; }
@@ -197,7 +196,7 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, src = &priv->sd.entity;/* get source pad of entity directly upstream from src */ - pad =imx_media_find_upstream_pad (priv->md, src,0 ); + pad =imx_media_pipeline_pad (src,0 ,0 , true);if (IS_ERR (pad))return PTR_ERR (pad);
@@ -1138,8 +1137,7 @@ static int csi_link_validate(struct v4l2_subdev *sd,*/ #if 0 mutex_unlock (&priv->lock); - vc_num =imx_media_find_mipi_csi2_channel (priv->md, - &priv->sd.entity); + vc_num =imx_media_find_mipi_csi2_channel (&priv->sd.entity);if (vc_num <0 )return vc_num;mutex_lock (&priv->lock);
@@ -1753,9 +1751,6 @@ static int csi_registered(struct v4l2_subdev *sd)int i, ret;u32 code; -/* get media device */ - priv->md =dev_get_drvdata (sd->v4l2_dev->dev); -/* get handle to IPU CSI */ csi =ipu_csi_get (priv->ipu, priv->csi_id);if (IS_ERR (csi)) {
drivers/staging/media/imx/imx-media-fim.c +0 -4
@@ -41,8 +41,6 @@ enum {#define FIM_CL_TOLERANCE_MAX_DEF 0/* no max tolerance (unbounded) */ struct imx_media_fim { -struct imx_media_dev *md; -/* the owning subdev of this fim instance */ struct v4l2_subdev *sd;
@@ -474,8 +472,6 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd)if (!fim)return ERR_PTR (-ENOMEM ); -/* get media device */ - fim->md =dev_get_drvdata (sd->v4l2_dev->dev); fim->sd = sd;spin_lock_init (&fim->lock);
drivers/staging/media/imx/imx-media-internal-sd.c +3 -2
@@ -35,7 +35,7 @@ struct internal_subdev {u32 grp_id;struct internal_pad pad[MAX_INTERNAL_PADS ]; -struct v4l2_subdev * (*sync_register)(struct imx_media_dev *imxmd, +struct v4l2_subdev * (*sync_register)(struct v4l2_device *v4l2_dev,struct device *ipu_dev,struct ipu_soc *ipu,u32 grp_id);
@@ -228,7 +228,8 @@ int imx_media_register_ipu_internal_subdevs(struct imx_media_dev *imxmd,continue ;mutex_unlock (&imxmd->mutex); - sd = intsd->sync_register (imxmd, ipu_dev, ipu, intsd->grp_id); + sd = intsd->sync_register (&imxmd->v4l2_dev, ipu_dev, ipu, + intsd->grp_id);mutex_lock (&imxmd->mutex);if (IS_ERR (sd)) { ret =PTR_ERR (sd);
drivers/staging/media/imx/imx-media-utils.c +71 -57
196 lines not on this page · raw message
drivers/staging/media/imx/imx-media-vdic.c +1 -4
@@ -65,7 +65,6 @@ struct vdic_priv {struct device *ipu_dev;struct ipu_soc *ipu; -struct imx_media_dev *md;struct v4l2_subdev sd;struct media_pad pad[VDIC_NUM_PADS ];
@@ -927,12 +926,11 @@ static const struct v4l2_subdev_internal_ops vdic_internal_ops = { .unregistered = vdic_unregistered, }; -struct v4l2_subdev *imx_media_vdic_register (struct imx_media_dev *imxmd, +struct v4l2_subdev *imx_media_vdic_register (struct v4l2_device *v4l2_dev,struct device *ipu_dev,struct ipu_soc *ipu,u32 grp_id) { -struct v4l2_device *v4l2_dev = &imxmd->v4l2_dev;struct vdic_priv *priv;int ret;
@@ -942,7 +940,6 @@ struct v4l2_subdev *imx_media_vdic_register(struct imx_media_dev *imxmd, priv->ipu_dev = ipu_dev; priv->ipu = ipu; - priv->md = imxmd;v4l2_subdev_init (&priv->sd, &vdic_subdev_ops);v4l2_set_subdevdata (&priv->sd, priv);
drivers/staging/media/imx/imx-media.h +10 -10
@@ -190,16 +190,16 @@ imx_media_find_subdev_by_devname(struct imx_media_dev *imxmd, const char *devname);void imx_media_add_video_device (struct imx_media_dev *imxmd,struct imx_media_video_dev *vdev); -int imx_media_find_mipi_csi2_channel (struct imx_media_dev *imxmd, -struct media_entity *start_entity); +int imx_media_pipeline_csi2_channel (struct media_entity *start_entity);struct media_pad * -imx_media_find_upstream_pad (struct imx_media_dev *imxmd, -struct media_entity *start_entity, -u32 grp_id); +imx_media_pipeline_pad (struct media_entity *start_entity,u32 grp_id, +enum v4l2_buf_type buftype,bool upstream);struct v4l2_subdev * -imx_media_find_upstream_subdev (struct imx_media_dev *imxmd, -struct media_entity *start_entity, -u32 grp_id); +imx_media_pipeline_subdev (struct media_entity *start_entity,u32 grp_id, +bool upstream); +struct video_device * +imx_media_pipeline_video_device (struct media_entity *start_entity, +enum v4l2_buf_type buftype,bool upstream);struct imx_media_dma_buf {void *virt;
@@ -250,14 +250,14 @@ int imx_media_of_add_csi(struct imx_media_dev *imxmd, struct device_node *csi_np);/* imx-media-vdic.c */ -struct v4l2_subdev *imx_media_vdic_register (struct imx_media_dev *imxmd, +struct v4l2_subdev *imx_media_vdic_register (struct v4l2_device *v4l2_dev,struct device *ipu_dev,struct ipu_soc *ipu,u32 grp_id);int imx_media_vdic_unregister (struct v4l2_subdev *sd);/* imx-ic-common.c */ -struct v4l2_subdev *imx_media_ic_register (struct imx_media_dev *imxmd, +struct v4l2_subdev *imx_media_ic_register (struct v4l2_device *v4l2_dev,struct device *ipu_dev,struct ipu_soc *ipu,u32 grp_id);
drivers/staging/media/imx/imx7-media-csi.c +1 -1
@@ -450,7 +450,7 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, skip_video_mux:/* get source pad of entity directly upstream from src */ - pad =imx_media_find_upstream_pad (csi->imxmd, src,0 ); + pad =imx_media_pipeline_pad (src,0 ,0 , true);if (IS_ERR (pad))return PTR_ERR (pad);
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v5 9/9 media: staging/imx: Don't set driver data for v4l2_dev
In reply to Steve LongerbeamThe media device is already available via multiple methods, there is no need to set driver data for v4l2_dev to the media device.
In imx_media_link_notify(), get media device from link->graph_obj.mdev.
In imx_media_capture_device_register(), get media device from v4l2_dev->mdev.
--- drivers/staging/media/imx/imx-media-capture.c | 5 +++-- drivers/staging/media/imx/imx-media-dev-common.c | 7 ++----- 2 files changed, 5 insertions(+), 7 deletions(-)
drivers/staging/media/imx/imx-media-capture.c +3 -2
@@ -735,15 +735,16 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) {struct capture_priv *priv =to_capture_priv (vdev);struct v4l2_subdev *sd = priv->src_sd; +struct v4l2_device *v4l2_dev = sd->v4l2_dev;struct video_device *vfd = vdev->vfd;struct vb2_queue *vq = &priv->q;struct v4l2_subdev_format fmt_src;int ret;/* get media device */ - priv->md =dev_get_drvdata (sd->v4l2_dev->dev); + priv->md = container_of(v4l2_dev->mdev, struct imx_media_dev, md); - vfd->v4l2_dev = sd->v4l2_dev; + vfd->v4l2_dev = v4l2_dev; ret =video_register_device (vfd,VFL_TYPE_GRABBER ,-1 );if (ret) {
drivers/staging/media/imx/imx-media-dev-common.c +2 -5
@@ -260,10 +260,11 @@ static int imx_media_inherit_controls(struct imx_media_dev *imxmd,static int imx_media_link_notify (struct media_link *link,u32 flags,unsigned int notification) { +struct imx_media_dev *imxmd =container_of (link->graph_obj.mdev, + struct imx_media_dev, md);struct media_entity *source = link->source->entity;struct imx_media_pad_vdev *pad_vdev;struct list_head *pad_vdev_list; -struct imx_media_dev *imxmd;struct video_device *vfd;struct v4l2_subdev *sd;int pad_idx, ret;
@@ -279,8 +280,6 @@ static int imx_media_link_notify(struct media_link *link, u32 flags, sd =media_entity_to_v4l2_subdev (source); pad_idx = link->source->index; - imxmd =dev_get_drvdata (sd->v4l2_dev->dev); - pad_vdev_list =to_pad_vdev_list (sd, pad_idx);if (!pad_vdev_list) {/* nothing to do if source sd has no pad vdev list */
@@ -384,8 +383,6 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev, goto cleanup; } -dev_set_drvdata (imxmd->v4l2_dev.dev, imxmd); -INIT_LIST_HEAD (&imxmd->vdev_list);v4l2_async_notifier_init (&imxmd->notifier);
Signature · 1 line
2.17.1