| Message ID | 20190412234359.5079-9-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | rcar-vin: Merge Gen2 and Gen3 file operations | expand |
> On April 13, 2019 at 1:43 AM Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> wrote: > > > After the rework of the Gen2 file operations it's now trivial to merge > the Gen2 and Gen3 versions. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/media/platform/rcar-vin/rcar-v4l2.c | 96 ++++----------------- > 1 file changed, 16 insertions(+), 80 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c > index 58d0b59ee1247c8f..2c9cae4b7abe925c 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -781,14 +781,19 @@ static int rvin_open(struct file *file) > if (ret) > goto err_pm; > > - if (v4l2_fh_is_singular_file(file)) { > - ret = rvin_power_parallel(vin, 1); > + if (vin->info->use_mc) { > + ret = v4l2_pipeline_pm_use(&vin->vdev.entity, 1); > if (ret < 0) > goto err_open; > + } else { > + if (v4l2_fh_is_singular_file(file)) { > + ret = rvin_power_parallel(vin, 1); "1" -> "true". (See patch 6/8). > + if (ret < 0) > + goto err_open; > > - v4l2_ctrl_handler_setup(&vin->ctrl_handler); > + v4l2_ctrl_handler_setup(&vin->ctrl_handler); > + } > } > - > mutex_unlock(&vin->lock); > > return 0; > @@ -816,12 +821,12 @@ static int rvin_release(struct file *file) > /* the release helper will cleanup any on-going streaming */ > ret = _vb2_fop_release(file, NULL); > > - /* > - * If this was the last open file. > - * Then de-initialize hw module. > - */ > - if (fh_singular) > - rvin_power_parallel(vin, 0); > + if (vin->info->use_mc) { > + v4l2_pipeline_pm_use(&vin->vdev.entity, 0); > + } else { > + if (fh_singular) > + rvin_power_parallel(vin, 0); "0" -> "false". > + } > > pm_runtime_put(vin->dev); > > @@ -840,74 +845,6 @@ static const struct v4l2_file_operations rvin_fops = { > .read = vb2_fop_read, > }; > > -/* ----------------------------------------------------------------------------- > - * Media controller file operations > - */ > - > -static int rvin_mc_open(struct file *file) > -{ > - struct rvin_dev *vin = video_drvdata(file); > - int ret; > - > - ret = mutex_lock_interruptible(&vin->lock); > - if (ret) > - return ret; > - > - ret = pm_runtime_get_sync(vin->dev); > - if (ret < 0) > - goto err_unlock; > - > - ret = v4l2_pipeline_pm_use(&vin->vdev.entity, 1); > - if (ret < 0) > - goto err_pm; > - > - file->private_data = vin; > - > - ret = v4l2_fh_open(file); > - if (ret) > - goto err_v4l2pm; > - > - mutex_unlock(&vin->lock); > - > - return 0; > -err_v4l2pm: > - v4l2_pipeline_pm_use(&vin->vdev.entity, 0); > -err_pm: > - pm_runtime_put(vin->dev); > -err_unlock: > - mutex_unlock(&vin->lock); > - > - return ret; > -} > - > -static int rvin_mc_release(struct file *file) > -{ > - struct rvin_dev *vin = video_drvdata(file); > - int ret; > - > - mutex_lock(&vin->lock); > - > - /* the release helper will cleanup any on-going streaming. */ > - ret = _vb2_fop_release(file, NULL); > - > - v4l2_pipeline_pm_use(&vin->vdev.entity, 0); > - pm_runtime_put(vin->dev); > - > - mutex_unlock(&vin->lock); > - > - return ret; > -} > - > -static const struct v4l2_file_operations rvin_mc_fops = { > - .owner = THIS_MODULE, > - .unlocked_ioctl = video_ioctl2, > - .open = rvin_mc_open, > - .release = rvin_mc_release, > - .poll = vb2_fop_poll, > - .mmap = vb2_fop_mmap, > - .read = vb2_fop_read, > -}; > - > void rvin_v4l2_unregister(struct rvin_dev *vin) > { > if (!video_is_registered(&vin->vdev)) > @@ -948,6 +885,7 @@ int rvin_v4l2_register(struct rvin_dev *vin) > snprintf(vdev->name, sizeof(vdev->name), "VIN%u output", vin->id); > vdev->release = video_device_release_empty; > vdev->lock = &vin->lock; > + vdev->fops = &rvin_fops; > vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | > V4L2_CAP_READWRITE; > > @@ -959,10 +897,8 @@ int rvin_v4l2_register(struct rvin_dev *vin) > vin->format.colorspace = RVIN_DEFAULT_COLORSPACE; > > if (vin->info->use_mc) { > - vdev->fops = &rvin_mc_fops; > vdev->ioctl_ops = &rvin_mc_ioctl_ops; > } else { > - vdev->fops = &rvin_fops; > vdev->ioctl_ops = &rvin_ioctl_ops; > rvin_reset_format(vin); > } > -- > 2.21.0 > With those fixed, Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> CU Uli
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 58d0b59ee1247c8f..2c9cae4b7abe925c 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -781,14 +781,19 @@ static int rvin_open(struct file *file) if (ret) goto err_pm; - if (v4l2_fh_is_singular_file(file)) { - ret = rvin_power_parallel(vin, 1); + if (vin->info->use_mc) { + ret = v4l2_pipeline_pm_use(&vin->vdev.entity, 1); if (ret < 0) goto err_open; + } else { + if (v4l2_fh_is_singular_file(file)) { + ret = rvin_power_parallel(vin, 1); + if (ret < 0) + goto err_open; - v4l2_ctrl_handler_setup(&vin->ctrl_handler); + v4l2_ctrl_handler_setup(&vin->ctrl_handler); + } } - mutex_unlock(&vin->lock); return 0; @@ -816,12 +821,12 @@ static int rvin_release(struct file *file) /* the release helper will cleanup any on-going streaming */ ret = _vb2_fop_release(file, NULL); - /* - * If this was the last open file. - * Then de-initialize hw module. - */ - if (fh_singular) - rvin_power_parallel(vin, 0); + if (vin->info->use_mc) { + v4l2_pipeline_pm_use(&vin->vdev.entity, 0); + } else { + if (fh_singular) + rvin_power_parallel(vin, 0); + } pm_runtime_put(vin->dev); @@ -840,74 +845,6 @@ static const struct v4l2_file_operations rvin_fops = { .read = vb2_fop_read, }; -/* ----------------------------------------------------------------------------- - * Media controller file operations - */ - -static int rvin_mc_open(struct file *file) -{ - struct rvin_dev *vin = video_drvdata(file); - int ret; - - ret = mutex_lock_interruptible(&vin->lock); - if (ret) - return ret; - - ret = pm_runtime_get_sync(vin->dev); - if (ret < 0) - goto err_unlock; - - ret = v4l2_pipeline_pm_use(&vin->vdev.entity, 1); - if (ret < 0) - goto err_pm; - - file->private_data = vin; - - ret = v4l2_fh_open(file); - if (ret) - goto err_v4l2pm; - - mutex_unlock(&vin->lock); - - return 0; -err_v4l2pm: - v4l2_pipeline_pm_use(&vin->vdev.entity, 0); -err_pm: - pm_runtime_put(vin->dev); -err_unlock: - mutex_unlock(&vin->lock); - - return ret; -} - -static int rvin_mc_release(struct file *file) -{ - struct rvin_dev *vin = video_drvdata(file); - int ret; - - mutex_lock(&vin->lock); - - /* the release helper will cleanup any on-going streaming. */ - ret = _vb2_fop_release(file, NULL); - - v4l2_pipeline_pm_use(&vin->vdev.entity, 0); - pm_runtime_put(vin->dev); - - mutex_unlock(&vin->lock); - - return ret; -} - -static const struct v4l2_file_operations rvin_mc_fops = { - .owner = THIS_MODULE, - .unlocked_ioctl = video_ioctl2, - .open = rvin_mc_open, - .release = rvin_mc_release, - .poll = vb2_fop_poll, - .mmap = vb2_fop_mmap, - .read = vb2_fop_read, -}; - void rvin_v4l2_unregister(struct rvin_dev *vin) { if (!video_is_registered(&vin->vdev)) @@ -948,6 +885,7 @@ int rvin_v4l2_register(struct rvin_dev *vin) snprintf(vdev->name, sizeof(vdev->name), "VIN%u output", vin->id); vdev->release = video_device_release_empty; vdev->lock = &vin->lock; + vdev->fops = &rvin_fops; vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE; @@ -959,10 +897,8 @@ int rvin_v4l2_register(struct rvin_dev *vin) vin->format.colorspace = RVIN_DEFAULT_COLORSPACE; if (vin->info->use_mc) { - vdev->fops = &rvin_mc_fops; vdev->ioctl_ops = &rvin_mc_ioctl_ops; } else { - vdev->fops = &rvin_fops; vdev->ioctl_ops = &rvin_ioctl_ops; rvin_reset_format(vin); }
After the rework of the Gen2 file operations it's now trivial to merge the Gen2 and Gen3 versions. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- drivers/media/platform/rcar-vin/rcar-v4l2.c | 96 ++++----------------- 1 file changed, 16 insertions(+), 80 deletions(-)