media: v4l2-subdev: Add pad versions of dv timing subdev calls

Currently, subdev dv timing calls (i.e. g/s/query_dv_timings) are video
ops without a pad argument. This is a problem if the subdevice can have
different dv timings for each pad (e.g. a DisplayPort receiver with
multiple virtual channels).

To solve this, change these calls to include a pad argument, and put
them into pad ops. Keep the old ones temporarily to make the switch
easier.

Signed-off-by: Paweł Anikiel <panikiel@google.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 4c6198c48dd612241841a41d26b4de8fced6ea3d..07759cdd08442019d6d4f556ca448313d623a229 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -369,6 +369,36 @@ static int call_set_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid)
        return check_edid(sd, edid) ? : sd->ops->pad->set_edid(sd, edid);
 }
 
+static int call_s_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
+                            struct v4l2_dv_timings *timings)
+{
+       if (!timings)
+               return -EINVAL;
+
+       return check_pad(sd, pad) ? :
+              sd->ops->pad->s_dv_timings(sd, pad, timings);
+}
+
+static int call_g_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
+                            struct v4l2_dv_timings *timings)
+{
+       if (!timings)
+               return -EINVAL;
+
+       return check_pad(sd, pad) ? :
+              sd->ops->pad->g_dv_timings(sd, pad, timings);
+}
+
+static int call_query_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
+                                struct v4l2_dv_timings *timings)
+{
+       if (!timings)
+               return -EINVAL;
+
+       return check_pad(sd, pad) ? :
+              sd->ops->pad->query_dv_timings(sd, pad, timings);
+}
+
 static int call_dv_timings_cap(struct v4l2_subdev *sd,
                               struct v4l2_dv_timings_cap *cap)
 {
@@ -487,6 +517,9 @@ static const struct v4l2_subdev_pad_ops v4l2_subdev_call_pad_wrappers = {
        .set_frame_interval     = call_set_frame_interval,
        .get_edid               = call_get_edid,
        .set_edid               = call_set_edid,
+       .s_dv_timings           = call_s_dv_timings,
+       .g_dv_timings           = call_g_dv_timings,
+       .query_dv_timings       = call_query_dv_timings,
        .dv_timings_cap         = call_dv_timings_cap,
        .enum_dv_timings        = call_enum_dv_timings,
        .get_frame_desc         = call_get_frame_desc,

diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index a9e6b814627913731f1ba6d56858327429fa14fe..a5213411ef2b5e6550e5a869154b3ee9b36568e3 100644 (file)
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -791,6 +791,14 @@ struct v4l2_subdev_state {
  *
  * @set_edid: callback for VIDIOC_SUBDEV_S_EDID() ioctl handler code.
  *
+ * @s_dv_timings: Set custom dv timings in the sub device. This is used
+ *     when sub device is capable of setting detailed timing information
+ *     in the hardware to generate/detect the video signal.
+ *
+ * @g_dv_timings: Get custom dv timings in the sub device.
+ *
+ * @query_dv_timings: callback for VIDIOC_QUERY_DV_TIMINGS() ioctl handler code.
+ *
  * @dv_timings_cap: callback for VIDIOC_SUBDEV_DV_TIMINGS_CAP() ioctl handler
  *                 code.
  *
@@ -864,6 +872,12 @@ struct v4l2_subdev_pad_ops {
                                  struct v4l2_subdev_frame_interval *interval);
        int (*get_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid);
        int (*set_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid);
+       int (*s_dv_timings)(struct v4l2_subdev *sd, unsigned int pad,
+                           struct v4l2_dv_timings *timings);
+       int (*g_dv_timings)(struct v4l2_subdev *sd, unsigned int pad,
+                           struct v4l2_dv_timings *timings);
+       int (*query_dv_timings)(struct v4l2_subdev *sd, unsigned int pad,
+                               struct v4l2_dv_timings *timings);
        int (*dv_timings_cap)(struct v4l2_subdev *sd,
                              struct v4l2_dv_timings_cap *cap);
        int (*enum_dv_timings)(struct v4l2_subdev *sd,