Re: [PATCH v2 11/14] media: v4l2-subdev: Add struct v4l2_subdev_client_info pointer to pad ops

[Sakari Ailus <sakari.ailus@linux.intel.com>]

Hi Mirela,

On Mon, Feb 16, 2026 at 05:40:42PM +0200, Mirela Rabulea wrote:
> Hi Sakari,
> 
> I get build errors after applying this patch, like:
> 
> drivers/media/i2c/imx219.c:1004:20: error: initialization of ‘int (*)(struct
> v4l2_subdev *, const struct v4l2_subdev_client_info *, struct
> v4l2_subdev_state *, struct v4l2_subdev_format *)’ from incompatible pointer
> type ‘int (*)(struct v4l2_subdev *, struct v4l2_subdev_state *, struct
> v4l2_subdev_format *)’ [-Wincompatible-pointer-types]
>  1004 |         .set_fmt = imx219_set_pad_format,
> 
> I'm not sure if it is fixed later, but after I apply all 14 patches, I still
> get some build errors (I'm building for ARM64).

Yes; I've noticed since posting this version I missed some required
changes. I'll address this in v3.

The change here (adding the client info argument) requires merging the last
few patches in the set. I've kept the patches separate as there's one
generated by Coccinelle entirely.

> 
> See also one other issue below.
> 
> On 2/11/26 11:09, Sakari Ailus wrote:
> > Add a pointer to const struct v4l2_subdev_client_info to the get_fmt,
> > set_fmt, get_selection and set_selection sub-device pad ops. The client
> > info struct will soon be used to differentiate UAPI based on client
> > capabilities.
> > 
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> >   drivers/media/v4l2-core/v4l2-subdev.c | 63 ++++++++++++++++++---------
> >   include/media/v4l2-subdev.h           |  9 +++-
> >   2 files changed, 51 insertions(+), 21 deletions(-)
> > 
> > diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
> > index 79fb4643182a..76ab70a99e86 100644
> > --- a/drivers/media/v4l2-core/v4l2-subdev.c
> > +++ b/drivers/media/v4l2-core/v4l2-subdev.c
> > @@ -245,19 +245,21 @@ static inline int check_format(struct v4l2_subdev *sd,
> >   }
> > 
> >   static int call_get_fmt(struct v4l2_subdev *sd,
> > +                       const struct v4l2_subdev_client_info *ci,
> >                          struct v4l2_subdev_state *state,
> >                          struct v4l2_subdev_format *format)
> >   {
> >          return check_format(sd, state, format) ? :
> > -              sd->ops->pad->get_fmt(sd, state, format);
> > +               sd->ops->pad->get_fmt(sd, ci, state, format);
> >   }
> > 
> >   static int call_set_fmt(struct v4l2_subdev *sd,
> > +                       const struct v4l2_subdev_client_info *ci,
> >                          struct v4l2_subdev_state *state,
> >                          struct v4l2_subdev_format *format)
> >   {
> >          return check_format(sd, state, format) ? :
> > -              sd->ops->pad->set_fmt(sd, state, format);
> > +               sd->ops->pad->set_fmt(sd, ci, state, format);
> >   }
> > 
> >   static int call_enum_mbus_code(struct v4l2_subdev *sd,
> > @@ -308,19 +310,21 @@ static inline int check_selection(struct v4l2_subdev *sd,
> >   }
> > 
> >   static int call_get_selection(struct v4l2_subdev *sd,
> > +                             const struct v4l2_subdev_client_info *ci,
> >                                struct v4l2_subdev_state *state,
> >                                struct v4l2_subdev_selection *sel)
> >   {
> >          return check_selection(sd, state, sel) ? :
> > -              sd->ops->pad->get_selection(sd, state, sel);
> > +               sd->ops->pad->get_selection(sd, ci, state, sel);
> >   }
> > 
> >   static int call_set_selection(struct v4l2_subdev *sd,
> > +                             const struct v4l2_subdev_client_info *ci,
> >                                struct v4l2_subdev_state *state,
> >                                struct v4l2_subdev_selection *sel)
> >   {
> >          return check_selection(sd, state, sel) ? :
> > -              sd->ops->pad->set_selection(sd, state, sel);
> > +               sd->ops->pad->set_selection(sd, ci, state, sel);
> >   }
> > 
> >   static inline int check_frame_interval(struct v4l2_subdev *sd,
> > @@ -523,6 +527,21 @@ static int call_s_stream(struct v4l2_subdev *sd, int enable)
> >                          v4l2_subdev_unlock_state(state);                   \
> >                  return ret;                                                \
> >          }
> > +#define DEFINE_STATE_WRAPPER_CI(f, arg_type)                               \
> > +       static int call_##f##_state(struct v4l2_subdev *sd,                \
> > +                                   const struct v4l2_subdev_client_info *ci, \
> > +                                   struct v4l2_subdev_state *_state,      \
> > +                                   arg_type *arg) \
> > +       {                                                                  \
> > +               struct v4l2_subdev_state *state = _state;                  \
> > +               int ret;                                                   \
> > +               if (!_state)                                               \
> > +                       state = v4l2_subdev_lock_and_get_active_state(sd); \
> > +               ret = call_##f(sd, ci, state, arg);                        \
> > +               if (!_state && state)                                      \
> > +                       v4l2_subdev_unlock_state(state);                   \
> > +               return ret;                                                \
> > +       }
> > 
> >   #else /* CONFIG_MEDIA_CONTROLLER */
> > 
> > @@ -536,13 +555,13 @@ static int call_s_stream(struct v4l2_subdev *sd, int enable)
> > 
> >   #endif /* CONFIG_MEDIA_CONTROLLER */
> > 
> > -DEFINE_STATE_WRAPPER(get_fmt, struct v4l2_subdev_format);
> > -DEFINE_STATE_WRAPPER(set_fmt, struct v4l2_subdev_format);
> > +DEFINE_STATE_WRAPPER_CI(get_fmt, struct v4l2_subdev_format);
> 
> DEFINE_STATE_WRAPPER_CI is not defined when CONFIG_MEDIA_CONTROLLER is not
> defined

I'll address that for v3.

-- 
Regards,

Sakari Ailus