From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from lb3-smtp-cloud2.xs4all.net ([194.109.24.29]:54916 "EHLO lb3-smtp-cloud2.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752363AbcDRKFC (ORCPT ); Mon, 18 Apr 2016 06:05:02 -0400 Subject: Re: [PATCH v3 5/7] media: rcar-vin: add DV timings support To: Ulrich Hecht , hans.verkuil@cisco.com, niklas.soderlund@ragnatech.se References: <1460650670-20849-1-git-send-email-ulrich.hecht+renesas@gmail.com> <1460650670-20849-6-git-send-email-ulrich.hecht+renesas@gmail.com> Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, magnus.damm@gmail.com, laurent.pinchart@ideasonboard.com, ian.molton@codethink.co.uk, lars@metafoo.de, william.towle@codethink.co.uk From: Hans Verkuil Message-ID: <5714B143.50902@xs4all.nl> Date: Mon, 18 Apr 2016 12:04:51 +0200 MIME-Version: 1.0 In-Reply-To: <1460650670-20849-6-git-send-email-ulrich.hecht+renesas@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Hi Ulrich, This isn't right: this just overwrites the adv7180 input with an HDMI input. I assume the intention is to have support for both adv7180 and HDMI input and to use VIDIOC_S_INPUT to select between the two. This really needs some more work, I'm afraid. Regards, Hans On 04/14/2016 06:17 PM, Ulrich Hecht wrote: > Adds ioctls DV_TIMINGS_CAP, ENUM_DV_TIMINGS, G_DV_TIMINGS, S_DV_TIMINGS, > and QUERY_DV_TIMINGS. > > Signed-off-by: Ulrich Hecht > --- > drivers/media/platform/rcar-vin/rcar-v4l2.c | 69 +++++++++++++++++++++++++++++ > 1 file changed, 69 insertions(+) > > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c > index d8d5f3a..ba2ed4e 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -413,12 +413,17 @@ static int rvin_enum_input(struct file *file, void *priv, > struct v4l2_input *i) > { > struct rvin_dev *vin = video_drvdata(file); > + struct v4l2_subdev *sd = vin_to_sd(vin); > > if (i->index != 0) > return -EINVAL; > > i->type = V4L2_INPUT_TYPE_CAMERA; > i->std = vin->vdev.tvnorms; > + > + if (v4l2_subdev_has_op(sd, pad, dv_timings_cap)) > + i->capabilities = V4L2_IN_CAP_DV_TIMINGS; > + > strlcpy(i->name, "Camera", sizeof(i->name)); > > return 0; > @@ -461,6 +466,64 @@ static int rvin_g_std(struct file *file, void *priv, v4l2_std_id *a) > return v4l2_subdev_call(sd, video, g_std, a); > } > > +static int rvin_enum_dv_timings(struct file *file, void *priv_fh, > + struct v4l2_enum_dv_timings *timings) > +{ > + struct rvin_dev *vin = video_drvdata(file); > + struct v4l2_subdev *sd = vin_to_sd(vin); > + > + timings->pad = 0; > + return v4l2_subdev_call(sd, > + pad, enum_dv_timings, timings); > +} > + > +static int rvin_s_dv_timings(struct file *file, void *priv_fh, > + struct v4l2_dv_timings *timings) > +{ > + struct rvin_dev *vin = video_drvdata(file); > + struct v4l2_subdev *sd = vin_to_sd(vin); > + int err; > + > + err = v4l2_subdev_call(sd, > + video, s_dv_timings, timings); > + if (!err) { > + vin->sensor.width = timings->bt.width; > + vin->sensor.height = timings->bt.height; > + } > + return err; > +} > + > +static int rvin_g_dv_timings(struct file *file, void *priv_fh, > + struct v4l2_dv_timings *timings) > +{ > + struct rvin_dev *vin = video_drvdata(file); > + struct v4l2_subdev *sd = vin_to_sd(vin); > + > + return v4l2_subdev_call(sd, > + video, g_dv_timings, timings); > +} > + > +static int rvin_query_dv_timings(struct file *file, void *priv_fh, > + struct v4l2_dv_timings *timings) > +{ > + struct rvin_dev *vin = video_drvdata(file); > + struct v4l2_subdev *sd = vin_to_sd(vin); > + > + return v4l2_subdev_call(sd, > + video, query_dv_timings, timings); > +} > + > +static int rvin_dv_timings_cap(struct file *file, void *priv_fh, > + struct v4l2_dv_timings_cap *cap) > +{ > + struct rvin_dev *vin = video_drvdata(file); > + struct v4l2_subdev *sd = vin_to_sd(vin); > + > + cap->pad = 0; > + return v4l2_subdev_call(sd, > + pad, dv_timings_cap, cap); > +} > + > static const struct v4l2_ioctl_ops rvin_ioctl_ops = { > .vidioc_querycap = rvin_querycap, > .vidioc_try_fmt_vid_cap = rvin_try_fmt_vid_cap, > @@ -477,6 +540,12 @@ static const struct v4l2_ioctl_ops rvin_ioctl_ops = { > .vidioc_g_input = rvin_g_input, > .vidioc_s_input = rvin_s_input, > > + .vidioc_dv_timings_cap = rvin_dv_timings_cap, > + .vidioc_enum_dv_timings = rvin_enum_dv_timings, > + .vidioc_g_dv_timings = rvin_g_dv_timings, > + .vidioc_s_dv_timings = rvin_s_dv_timings, > + .vidioc_query_dv_timings = rvin_query_dv_timings, > + > .vidioc_querystd = rvin_querystd, > .vidioc_g_std = rvin_g_std, > .vidioc_s_std = rvin_s_std, >