| Message ID | 1437654103-26409-8-git-send-email-william.towle@codethink.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/23/2015 02:21 PM, William Towle wrote: > Add detection of source pad number for drivers aware of the media > controller API, so that the combination of soc_camera and rcar_vin > can create device nodes to support modern drivers such as adv7604.c > (for HDMI on Lager) and the converted adv7180.c (for composite) > underneath. > > Building rcar_vin gains a dependency on CONFIG_MEDIA_CONTROLLER, in > line with requirements for building the drivers associated with it. > > Signed-off-by: William Towle <william.towle@codethink.co.uk> > Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk> > --- > drivers/media/platform/soc_camera/Kconfig | 1 + > drivers/media/platform/soc_camera/rcar_vin.c | 1 + > drivers/media/platform/soc_camera/soc_camera.c | 36 ++++++++++++++++++++++++ > include/media/soc_camera.h | 1 + > 4 files changed, 39 insertions(+) > > diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig > index f2776cd..5c45c83 100644 > --- a/drivers/media/platform/soc_camera/Kconfig > +++ b/drivers/media/platform/soc_camera/Kconfig > @@ -38,6 +38,7 @@ config VIDEO_RCAR_VIN > depends on VIDEO_DEV && SOC_CAMERA > depends on ARCH_SHMOBILE || COMPILE_TEST > depends on HAS_DMA > + depends on MEDIA_CONTROLLER > select VIDEOBUF2_DMA_CONTIG > select SOC_CAMERA_SCALE_CROP > ---help--- > diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c > index 16352a8..00c1034 100644 > --- a/drivers/media/platform/soc_camera/rcar_vin.c > +++ b/drivers/media/platform/soc_camera/rcar_vin.c > @@ -1359,6 +1359,7 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx, > struct device *dev = icd->parent; > int shift; > > + fmt.pad = icd->src_pad_idx; > ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt); > if (ret < 0) > return ret; > diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c > index d708df4..8d4d20c 100644 > --- a/drivers/media/platform/soc_camera/soc_camera.c > +++ b/drivers/media/platform/soc_camera/soc_camera.c > @@ -1293,6 +1293,9 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) > .which = V4L2_SUBDEV_FORMAT_ACTIVE, > }; > struct v4l2_mbus_framefmt *mf = &fmt.format; > +#if defined(CONFIG_MEDIA_CONTROLLER) > + struct media_pad pad; > +#endif > int ret; > > sd->grp_id = soc_camera_grp_id(icd); > @@ -1310,8 +1313,33 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) > return ret; > } > > + icd->src_pad_idx = 0; > +#if defined(CONFIG_MEDIA_CONTROLLER) > /* At this point client .probe() should have run already */ > + ret = media_entity_init(&icd->vdev->entity, 1, &pad, 0); Why would you want to init vdev->entity? soc-camera doesn't create a media controller device, so there is no point in doing this. > + if (ret < 0) { > + goto eusrfmt; > + } else { > + int pad_idx; > + > + for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++) > + if (sd->entity.pads[pad_idx].flags > + == MEDIA_PAD_FL_SOURCE) > + break; > + if (pad_idx >= sd->entity.num_pads) > + goto eusrfmt; > + > + icd->src_pad_idx = pad_idx; This is all you need. > + ret = soc_camera_init_user_formats(icd); > + if (ret < 0) { > + icd->src_pad_idx = -1; > + goto eusrfmt; > + } Why is this inside the 'else' part? Isn't this shared code that can go below? > + } > +#else > ret = soc_camera_init_user_formats(icd); > +#endif > + > if (ret < 0) > goto eusrfmt; > > @@ -1335,6 +1363,9 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) > evidstart: > soc_camera_free_user_formats(icd); > eusrfmt: > +#if defined(CONFIG_MEDIA_CONTROLLER) > + media_entity_cleanup(&icd->vdev->entity); > +#endif > soc_camera_remove_device(icd); > > return ret; > @@ -1856,6 +1887,11 @@ static int soc_camera_remove(struct soc_camera_device *icd) > if (icd->num_user_formats) > soc_camera_free_user_formats(icd); > > +#if defined(CONFIG_MEDIA_CONTROLLER) > + if (icd->vdev->entity.num_pads) > + media_entity_cleanup(&icd->vdev->entity); > +#endif > + > if (icd->clk) { > /* For the synchronous case */ > v4l2_clk_unregister(icd->clk); > diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h > index 2f6261f..30193cf 100644 > --- a/include/media/soc_camera.h > +++ b/include/media/soc_camera.h > @@ -42,6 +42,7 @@ struct soc_camera_device { > unsigned char devnum; /* Device number per host */ > struct soc_camera_sense *sense; /* See comment in struct definition */ > struct video_device *vdev; > + int src_pad_idx; /* For media-controller drivers */ > struct v4l2_ctrl_handler ctrl_handler; > const struct soc_camera_format_xlate *current_fmt; > struct soc_camera_format_xlate *user_formats; > Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello! On 7/23/2015 2:21 PM, William Towle wrote: > Add detection of source pad number for drivers aware of the media > controller API, so that the combination of soc_camera and rcar_vin > can create device nodes to support modern drivers such as adv7604.c > (for HDMI on Lager) and the converted adv7180.c (for composite) > underneath. > > Building rcar_vin gains a dependency on CONFIG_MEDIA_CONTROLLER, in > line with requirements for building the drivers associated with it. > > Signed-off-by: William Towle <william.towle@codethink.co.uk> > Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk> > --- > drivers/media/platform/soc_camera/Kconfig | 1 + > drivers/media/platform/soc_camera/rcar_vin.c | 1 + This driver no longer exists. What did you base on? > drivers/media/platform/soc_camera/soc_camera.c | 36 ++++++++++++++++++++++++ > include/media/soc_camera.h | 1 + > 4 files changed, 39 insertions(+) [...] > @@ -1310,8 +1313,33 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) > return ret; > } > > + icd->src_pad_idx = 0; > +#if defined(CONFIG_MEDIA_CONTROLLER) > /* At this point client .probe() should have run already */ > + ret = media_entity_init(&icd->vdev->entity, 1, &pad, 0); > + if (ret < 0) { > + goto eusrfmt; > + } else { > + int pad_idx; > + > + for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++) > + if (sd->entity.pads[pad_idx].flags > + == MEDIA_PAD_FL_SOURCE) Please leave == on the previous line... [...] MBR, Sergei
On 10/27/2017 10:52 AM, Sergei Shtylyov wrote: >> Add detection of source pad number for drivers aware of the media >> controller API, so that the combination of soc_camera and rcar_vin >> can create device nodes to support modern drivers such as adv7604.c >> (for HDMI on Lager) and the converted adv7180.c (for composite) >> underneath. >> >> Building rcar_vin gains a dependency on CONFIG_MEDIA_CONTROLLER, in >> line with requirements for building the drivers associated with it. >> >> Signed-off-by: William Towle <william.towle@codethink.co.uk> >> Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk> >> --- >> drivers/media/platform/soc_camera/Kconfig | 1 + >> drivers/media/platform/soc_camera/rcar_vin.c | 1 + > > This driver no longer exists. What did you base on? Sorry, I didn't realize I was replying to 2 years old patch. :-) [...] MBR, Sergei
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig index f2776cd..5c45c83 100644 --- a/drivers/media/platform/soc_camera/Kconfig +++ b/drivers/media/platform/soc_camera/Kconfig @@ -38,6 +38,7 @@ config VIDEO_RCAR_VIN depends on VIDEO_DEV && SOC_CAMERA depends on ARCH_SHMOBILE || COMPILE_TEST depends on HAS_DMA + depends on MEDIA_CONTROLLER select VIDEOBUF2_DMA_CONTIG select SOC_CAMERA_SCALE_CROP ---help--- diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 16352a8..00c1034 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -1359,6 +1359,7 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx, struct device *dev = icd->parent; int shift; + fmt.pad = icd->src_pad_idx; ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt); if (ret < 0) return ret; diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index d708df4..8d4d20c 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -1293,6 +1293,9 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) .which = V4L2_SUBDEV_FORMAT_ACTIVE, }; struct v4l2_mbus_framefmt *mf = &fmt.format; +#if defined(CONFIG_MEDIA_CONTROLLER) + struct media_pad pad; +#endif int ret; sd->grp_id = soc_camera_grp_id(icd); @@ -1310,8 +1313,33 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) return ret; } + icd->src_pad_idx = 0; +#if defined(CONFIG_MEDIA_CONTROLLER) /* At this point client .probe() should have run already */ + ret = media_entity_init(&icd->vdev->entity, 1, &pad, 0); + if (ret < 0) { + goto eusrfmt; + } else { + int pad_idx; + + for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++) + if (sd->entity.pads[pad_idx].flags + == MEDIA_PAD_FL_SOURCE) + break; + if (pad_idx >= sd->entity.num_pads) + goto eusrfmt; + + icd->src_pad_idx = pad_idx; + ret = soc_camera_init_user_formats(icd); + if (ret < 0) { + icd->src_pad_idx = -1; + goto eusrfmt; + } + } +#else ret = soc_camera_init_user_formats(icd); +#endif + if (ret < 0) goto eusrfmt; @@ -1335,6 +1363,9 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) evidstart: soc_camera_free_user_formats(icd); eusrfmt: +#if defined(CONFIG_MEDIA_CONTROLLER) + media_entity_cleanup(&icd->vdev->entity); +#endif soc_camera_remove_device(icd); return ret; @@ -1856,6 +1887,11 @@ static int soc_camera_remove(struct soc_camera_device *icd) if (icd->num_user_formats) soc_camera_free_user_formats(icd); +#if defined(CONFIG_MEDIA_CONTROLLER) + if (icd->vdev->entity.num_pads) + media_entity_cleanup(&icd->vdev->entity); +#endif + if (icd->clk) { /* For the synchronous case */ v4l2_clk_unregister(icd->clk); diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 2f6261f..30193cf 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -42,6 +42,7 @@ struct soc_camera_device { unsigned char devnum; /* Device number per host */ struct soc_camera_sense *sense; /* See comment in struct definition */ struct video_device *vdev; + int src_pad_idx; /* For media-controller drivers */ struct v4l2_ctrl_handler ctrl_handler; const struct soc_camera_format_xlate *current_fmt; struct soc_camera_format_xlate *user_formats;