[media] v4l2-subdev: replace v4l2_subdev_fh by v4l2_subdev_pad_config

If a subdevice pad op is called from a bridge driver, then there is
no v4l2_subdev_fh struct that can be passed to the subdevice. This
made it hard to use such subdevs from a bridge driver.

This patch replaces the v4l2_subdev_fh pointer by a v4l2_subdev_pad_config
pointer in the pad ops. This allows bridge drivers to use the various
try_ pad ops by creating a v4l2_subdev_pad_config struct and passing it
along to the pad op.

The v4l2_subdev_get_try_* macros had to be changed because of this, so
I also took the opportunity to use the full name of the v4l2_subdev_get_try_*
functions in the __V4L2_SUBDEV_MK_GET_TRY macro arguments: if you now do
'git grep v4l2_subdev_get_try_format' you will actually find the header
where it is defined.

One remark regarding the drivers/staging/media/davinci_vpfe patches: the
*_init_formats() functions assumed that fh could be NULL. However, that's
not true for this driver, it's always set. This is almost certainly a copy
and paste from the omap3isp driver. I've updated the code to reflect the
fact that fh is never NULL.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Tested-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index b75878c..a493c0b 100644 (file)
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -582,7 +582,7 @@ static void adv7180_exit_controls(struct adv7180_state *state)
 }
 
 static int adv7180_enum_mbus_code(struct v4l2_subdev *sd,
-                                 struct v4l2_subdev_fh *fh,
+                                 struct v4l2_subdev_pad_config *cfg,
                                  struct v4l2_subdev_mbus_code_enum *code)
 {
        if (code->index != 0)
@@ -645,13 +645,13 @@ static int adv7180_set_field_mode(struct adv7180_state *state)
 }
 
 static int adv7180_get_pad_format(struct v4l2_subdev *sd,
-                                 struct v4l2_subdev_fh *fh,
+                                 struct v4l2_subdev_pad_config *cfg,
                                  struct v4l2_subdev_format *format)
 {
        struct adv7180_state *state = to_state(sd);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               format->format = *v4l2_subdev_get_try_format(fh, 0);
+               format->format = *v4l2_subdev_get_try_format(sd, cfg, 0);
        } else {
                adv7180_mbus_fmt(sd, &format->format);
                format->format.field = state->field;
@@ -661,7 +661,7 @@ static int adv7180_get_pad_format(struct v4l2_subdev *sd,
 }
 
 static int adv7180_set_pad_format(struct v4l2_subdev *sd,
-                                 struct v4l2_subdev_fh *fh,
+                                 struct v4l2_subdev_pad_config *cfg,
                                  struct v4l2_subdev_format *format)
 {
        struct adv7180_state *state = to_state(sd);
@@ -686,7 +686,7 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd,
                        adv7180_set_power(state, true);
                }
        } else {
-               framefmt = v4l2_subdev_get_try_format(fh, 0);
+               framefmt = v4l2_subdev_get_try_format(sd, cfg, 0);
                *framefmt = format->format;
        }
 

diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c
index 81736aa..03ea62f 100644 (file)
--- a/drivers/media/i2c/adv7511.c
+++ b/drivers/media/i2c/adv7511.c
@@ -810,7 +810,7 @@ static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
 }
 
 static int adv7511_enum_mbus_code(struct v4l2_subdev *sd,
-                                 struct v4l2_subdev_fh *fh,
+                                 struct v4l2_subdev_pad_config *cfg,
                                  struct v4l2_subdev_mbus_code_enum *code)
 {
        if (code->pad != 0)
@@ -842,8 +842,9 @@ static void adv7511_fill_format(struct adv7511_state *state,
        format->field = V4L2_FIELD_NONE;
 }
 
-static int adv7511_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
-                             struct v4l2_subdev_format *format)
+static int adv7511_get_fmt(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_pad_config *cfg,
+                          struct v4l2_subdev_format *format)
 {
        struct adv7511_state *state = get_adv7511_state(sd);
 
@@ -855,7 +856,7 @@ static int adv7511_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(fh, format->pad);
+               fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
                format->format.code = fmt->code;
                format->format.colorspace = fmt->colorspace;
                format->format.ycbcr_enc = fmt->ycbcr_enc;
@@ -870,8 +871,9 @@ static int adv7511_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
        return 0;
 }
 
-static int adv7511_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
-                      struct v4l2_subdev_format *format)
+static int adv7511_set_fmt(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_pad_config *cfg,
+                          struct v4l2_subdev_format *format)
 {
        struct adv7511_state *state = get_adv7511_state(sd);
        /*
@@ -905,7 +907,7 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(fh, format->pad);
+               fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
                fmt->code = format->format.code;
                fmt->colorspace = format->format.colorspace;
                fmt->ycbcr_enc = format->format.ycbcr_enc;

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index aaab9c9..1e58537 100644 (file)
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -1734,7 +1734,7 @@ static int adv76xx_s_routing(struct v4l2_subdev *sd,
 }
 
 static int adv76xx_enum_mbus_code(struct v4l2_subdev *sd,
-                                 struct v4l2_subdev_fh *fh,
+                                 struct v4l2_subdev_pad_config *cfg,
                                  struct v4l2_subdev_mbus_code_enum *code)
 {
        struct adv76xx_state *state = to_state(sd);
@@ -1811,7 +1811,8 @@ static void adv76xx_setup_format(struct adv76xx_state *state)
                        state->format->swap_cb_cr ? ADV76XX_OP_SWAP_CB_CR : 0);
 }
 
-static int adv76xx_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+static int adv76xx_get_format(struct v4l2_subdev *sd,
+                             struct v4l2_subdev_pad_config *cfg,
                              struct v4l2_subdev_format *format)
 {
        struct adv76xx_state *state = to_state(sd);
@@ -1824,7 +1825,7 @@ static int adv76xx_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(fh, format->pad);
+               fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
                format->format.code = fmt->code;
        } else {
                format->format.code = state->format->code;
@@ -1833,7 +1834,8 @@ static int adv76xx_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
        return 0;
 }
 
-static int adv76xx_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+static int adv76xx_set_format(struct v4l2_subdev *sd,
+                             struct v4l2_subdev_pad_config *cfg,
                              struct v4l2_subdev_format *format)
 {
        struct adv76xx_state *state = to_state(sd);
@@ -1852,7 +1854,7 @@ static int adv76xx_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(fh, format->pad);
+               fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
                fmt->code = format->format.code;
        } else {
                state->format = info;

diff --cc drivers/media/i2c/m5mols/m5mols_core.c
Simple merge

diff --cc drivers/media/i2c/mt9m032.c
Simple merge

diff --cc drivers/media/i2c/mt9p031.c
Simple merge

diff --cc drivers/media/i2c/mt9t001.c
Simple merge

diff --cc drivers/media/i2c/mt9v032.c
Simple merge

diff --cc drivers/media/i2c/noon010pc30.c
Simple merge

diff --cc drivers/media/i2c/ov9650.c
Simple merge

diff --cc drivers/media/i2c/s5c73m3/s5c73m3-core.c
Simple merge

diff --cc drivers/media/i2c/s5k4ecgx.c
Simple merge

diff --cc drivers/media/i2c/s5k5baf.c
Simple merge

diff --cc drivers/media/i2c/s5k6a3.c
Simple merge

diff --cc drivers/media/i2c/s5k6aa.c
Simple merge

diff --cc drivers/media/i2c/smiapp/smiapp-core.c
Simple merge

diff --cc drivers/media/i2c/tvp514x.c
Simple merge

diff --cc drivers/media/i2c/tvp7002.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-capture.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-isp.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-lite.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/mipi-csis.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispccdc.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispccp2.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispcsi2.c
Simple merge

diff --cc drivers/media/platform/omap3isp/isppreview.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispresizer.c
Simple merge

diff --cc drivers/media/platform/s3c-camif/camif-capture.c
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_bru.c
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_entity.c
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_entity.h
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_hsit.c
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_lif.c
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_lut.c
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_rwpf.c
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_rwpf.h
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_sru.c
Simple merge

diff --cc drivers/media/platform/vsp1/vsp1_uds.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-subdev.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_ipipe.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_isif.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_resizer.c
Simple merge

diff --cc drivers/staging/media/omap4iss/iss_csi2.c
Simple merge

diff --cc drivers/staging/media/omap4iss/iss_ipipe.c
Simple merge

diff --cc drivers/staging/media/omap4iss/iss_ipipeif.c
Simple merge

diff --cc drivers/staging/media/omap4iss/iss_resizer.c
Simple merge

diff --cc include/media/v4l2-subdev.h
Simple merge