Hej Sakari, Tack för dina kommentarer.
On 2017-12-15 13:54:02 +0200, Sakari Ailus wrote: > On Thu, Dec 14, 2017 at 08:08:22PM +0100, Niklas Söderlund wrote: > > The pipeline will be moved from the entity to the pads; reflect this in > > the media pipeline function API. > > I'll merge this to "media: entity: Use pad as the starting point for a > pipeline" if you're fine with that. I'm fine with that, the issue is that the rcar-vin Gen3 driver is not yet upstream :-( If it makes it upstream before the work in your vc branch feel free to squash this in. Until then I fear I need to keep carry this in this series. > > I haven't compiled everything for some time, and newly added drivers may be > lacking these changes. I'll re-check that soonish. > > > > > Signed-off-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se> > > --- > > drivers/media/platform/rcar-vin/rcar-dma.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c > > b/drivers/media/platform/rcar-vin/rcar-dma.c > > index 03a914361a33125c..cf30e5fceb1d493a 100644 > > --- a/drivers/media/platform/rcar-vin/rcar-dma.c > > +++ b/drivers/media/platform/rcar-vin/rcar-dma.c > > @@ -1179,7 +1179,7 @@ static int rvin_set_stream(struct rvin_dev *vin, int > > on) > > return -EPIPE; > > > > if (!on) { > > - media_pipeline_stop(&vin->vdev.entity); > > + media_pipeline_stop(vin->vdev.entity.pads); > > return v4l2_subdev_call(sd, video, s_stream, 0); > > } > > > > @@ -1235,15 +1235,15 @@ static int rvin_set_stream(struct rvin_dev *vin, > > int on) > > fmt.format.height != vin->format.height) > > return -EPIPE; > > > > - pipe = sd->entity.pipe ? sd->entity.pipe : &vin->vdev.pipe; > > - if (media_pipeline_start(&vin->vdev.entity, pipe)) > > + pipe = sd->entity.pads->pipe ? sd->entity.pads->pipe : &vin->vdev.pipe; > > + if (media_pipeline_start(vin->vdev.entity.pads, pipe)) > > return -EPIPE; > > > > ret = v4l2_subdev_call(sd, video, s_stream, 1); > > if (ret == -ENOIOCTLCMD) > > ret = 0; > > if (ret) > > - media_pipeline_stop(&vin->vdev.entity); > > + media_pipeline_stop(vin->vdev.entity.pads); > > > > return ret; > > } > > -- > > 2.15.1 > > > > -- > Sakari Ailus > sakari.ai...@linux.intel.com -- Regards, Niklas Söderlund