media: v4l: subdev: Always compile sub-device state access functions
PATCH 1/1 media: v4l: subdev: Always compile sub-device state access functions
Compile sub-device state information access functions v4l2_subdev_state_get_{format,crop,compose} unconditionally as they are now also used by plain V4L2 drivers.
--- drivers/media/v4l2-core/v4l2-subdev.c | 204 +++++++++++++------------- include/media/v4l2-subdev.h | 128 ++++++++-------- 2 files changed, 166 insertions(+), 166 deletions(-)
drivers/media/v4l2-core/v4l2-subdev.c +102 -102
@@ -1524,6 +1524,108 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd) }EXPORT_SYMBOL_GPL (v4l2_subdev_cleanup); +struct v4l2_mbus_framefmt * +__v4l2_subdev_state_get_format (struct v4l2_subdev_state *state, +unsigned int pad,u32 stream) +{ +struct v4l2_subdev_stream_configs *stream_configs; +unsigned int i; + +if (WARN_ON_ONCE (!state)) +return NULL ; + +if (state->pads) { +if (stream) +return NULL ; + +if (pad >= state->sd->entity.num_pads) +return NULL ; + +return &state->pads[pad].format; + } + +lockdep_assert_held (state->lock); + + stream_configs = &state->stream_configs; + +for (i =0 ; i < stream_configs->num_configs; ++i) { +if (stream_configs->configs[i].pad == pad && + stream_configs->configs[i].stream == stream) +return &stream_configs->configs[i].fmt; + } + +return NULL ; +} +EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_format); + +struct v4l2_rect * +__v4l2_subdev_state_get_crop (struct v4l2_subdev_state *state,unsigned int pad, +u32 stream) +{ +struct v4l2_subdev_stream_configs *stream_configs; +unsigned int i; + +if (WARN_ON_ONCE (!state)) +return NULL ; + +if (state->pads) { +if (stream) +return NULL ; + +if (pad >= state->sd->entity.num_pads) +return NULL ; + +return &state->pads[pad].crop; + } + +lockdep_assert_held (state->lock); + + stream_configs = &state->stream_configs; + +for (i =0 ; i < stream_configs->num_configs; ++i) { +if (stream_configs->configs[i].pad == pad && + stream_configs->configs[i].stream == stream) +return &stream_configs->configs[i].crop; + } + +return NULL ; +} +EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_crop); + +struct v4l2_rect * +__v4l2_subdev_state_get_compose (struct v4l2_subdev_state *state, +unsigned int pad,u32 stream) +{ +struct v4l2_subdev_stream_configs *stream_configs; +unsigned int i; + +if (WARN_ON_ONCE (!state)) +return NULL ; + +if (state->pads) { +if (stream) +return NULL ; + +if (pad >= state->sd->entity.num_pads) +return NULL ; + +return &state->pads[pad].compose; + } + +lockdep_assert_held (state->lock); + + stream_configs = &state->stream_configs; + +for (i =0 ; i < stream_configs->num_configs; ++i) { +if (stream_configs->configs[i].pad == pad && + stream_configs->configs[i].stream == stream) +return &stream_configs->configs[i].compose; + } + +return NULL ; +} +EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_compose); +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API ) static int
@@ -1670,108 +1772,6 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, }EXPORT_SYMBOL_GPL (v4l2_subdev_set_routing_with_fmt); -struct v4l2_mbus_framefmt * -__v4l2_subdev_state_get_format (struct v4l2_subdev_state *state, -unsigned int pad,u32 stream) -{ -struct v4l2_subdev_stream_configs *stream_configs; -unsigned int i; - -if (WARN_ON_ONCE (!state)) -return NULL ; - -if (state->pads) { -if (stream) -return NULL ; - -if (pad >= state->sd->entity.num_pads) -return NULL ; - -return &state->pads[pad].format; - } - -lockdep_assert_held (state->lock); - - stream_configs = &state->stream_configs; - -for (i =0 ; i < stream_configs->num_configs; ++i) { -if (stream_configs->configs[i].pad == pad && - stream_configs->configs[i].stream == stream) -return &stream_configs->configs[i].fmt; - } - -return NULL ; -} -EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_format); - -struct v4l2_rect * -__v4l2_subdev_state_get_crop (struct v4l2_subdev_state *state,unsigned int pad, -u32 stream) -{ -struct v4l2_subdev_stream_configs *stream_configs; -unsigned int i; - -if (WARN_ON_ONCE (!state)) -return NULL ; - -if (state->pads) { -if (stream) -return NULL ; - -if (pad >= state->sd->entity.num_pads) -return NULL ; - -return &state->pads[pad].crop; - } - -lockdep_assert_held (state->lock); - - stream_configs = &state->stream_configs; - -for (i =0 ; i < stream_configs->num_configs; ++i) { -if (stream_configs->configs[i].pad == pad && - stream_configs->configs[i].stream == stream) -return &stream_configs->configs[i].crop; - } - -return NULL ; -} -EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_crop); - -struct v4l2_rect * -__v4l2_subdev_state_get_compose (struct v4l2_subdev_state *state, -unsigned int pad,u32 stream) -{ -struct v4l2_subdev_stream_configs *stream_configs; -unsigned int i; - -if (WARN_ON_ONCE (!state)) -return NULL ; - -if (state->pads) { -if (stream) -return NULL ; - -if (pad >= state->sd->entity.num_pads) -return NULL ; - -return &state->pads[pad].compose; - } - -lockdep_assert_held (state->lock); - - stream_configs = &state->stream_configs; - -for (i =0 ; i < stream_configs->num_configs; ++i) { -if (stream_configs->configs[i].pad == pad && - stream_configs->configs[i].stream == stream) -return &stream_configs->configs[i].compose; - } - -return NULL ; -} -EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_compose); -int v4l2_subdev_routing_find_opposite_end (const struct v4l2_subdev_krouting *routing,u32 pad,u32 stream,u32 *other_pad,u32 *other_stream)
include/media/v4l2-subdev.h +64 -64
140 lines not on this page · raw message
Signature · 1 line
2.39.2
Hi Sakari,
Thank you for the patch.
Quoted 3 lines · Sakari Ailus
Compile sub-device state information access functions v4l2_subdev_state_get_{format,crop,compose} unconditionally as they are now also used by plain V4L2 drivers.
What do you mean by "plain" V4L2 drivers here ?
Quoted 374 lines
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/v4l2-core/v4l2-subdev.c | 204 +++++++++++++------------- include/media/v4l2-subdev.h | 128 ++++++++-------- 2 files changed, 166 insertions(+), 166 deletions(-)drivers/media/v4l2-core/v4l2-subdev.c +102
-102@@ -1524,6 +1524,108 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd) }EXPORT_SYMBOL_GPL (v4l2_subdev_cleanup); +struct v4l2_mbus_framefmt * +__v4l2_subdev_state_get_format (struct v4l2_subdev_state *state, +unsigned int pad,u32 stream) +{ +struct v4l2_subdev_stream_configs *stream_configs; +unsigned int i; + +if (WARN_ON_ONCE (!state)) +return NULL ; + +if (state->pads) { +if (stream) +return NULL ; + +if (pad >= state->sd->entity.num_pads) +return NULL ; + +return &state->pads[pad].format; + } + +lockdep_assert_held (state->lock); + + stream_configs = &state->stream_configs; + +for (i =0 ; i < stream_configs->num_configs; ++i) { +if (stream_configs->configs[i].pad == pad && + stream_configs->configs[i].stream == stream) +return &stream_configs->configs[i].fmt; + } + +return NULL ; +} +EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_format); + +struct v4l2_rect * +__v4l2_subdev_state_get_crop (struct v4l2_subdev_state *state,unsigned int pad, +u32 stream) +{ +struct v4l2_subdev_stream_configs *stream_configs; +unsigned int i; + +if (WARN_ON_ONCE (!state)) +return NULL ; + +if (state->pads) { +if (stream) +return NULL ; + +if (pad >= state->sd->entity.num_pads) +return NULL ; + +return &state->pads[pad].crop; + } + +lockdep_assert_held (state->lock); + + stream_configs = &state->stream_configs; + +for (i =0 ; i < stream_configs->num_configs; ++i) { +if (stream_configs->configs[i].pad == pad && + stream_configs->configs[i].stream == stream) +return &stream_configs->configs[i].crop; + } + +return NULL ; +} +EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_crop); + +struct v4l2_rect * +__v4l2_subdev_state_get_compose (struct v4l2_subdev_state *state, +unsigned int pad,u32 stream) +{ +struct v4l2_subdev_stream_configs *stream_configs; +unsigned int i; + +if (WARN_ON_ONCE (!state)) +return NULL ; + +if (state->pads) { +if (stream) +return NULL ; + +if (pad >= state->sd->entity.num_pads) +return NULL ; + +return &state->pads[pad].compose; + } + +lockdep_assert_held (state->lock); + + stream_configs = &state->stream_configs; + +for (i =0 ; i < stream_configs->num_configs; ++i) { +if (stream_configs->configs[i].pad == pad && + stream_configs->configs[i].stream == stream) +return &stream_configs->configs[i].compose; + } + +return NULL ; +} +EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_compose); +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API ) static int@@ -1670,108 +1772,6 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, }EXPORT_SYMBOL_GPL (v4l2_subdev_set_routing_with_fmt); -struct v4l2_mbus_framefmt * -__v4l2_subdev_state_get_format (struct v4l2_subdev_state *state, -unsigned int pad,u32 stream) -{ -struct v4l2_subdev_stream_configs *stream_configs; -unsigned int i; - -if (WARN_ON_ONCE (!state)) -return NULL ; - -if (state->pads) { -if (stream) -return NULL ; - -if (pad >= state->sd->entity.num_pads) -return NULL ; - -return &state->pads[pad].format; - } - -lockdep_assert_held (state->lock); - - stream_configs = &state->stream_configs; - -for (i =0 ; i < stream_configs->num_configs; ++i) { -if (stream_configs->configs[i].pad == pad && - stream_configs->configs[i].stream == stream) -return &stream_configs->configs[i].fmt; - } - -return NULL ; -} -EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_format); - -struct v4l2_rect * -__v4l2_subdev_state_get_crop (struct v4l2_subdev_state *state,unsigned int pad, -u32 stream) -{ -struct v4l2_subdev_stream_configs *stream_configs; -unsigned int i; - -if (WARN_ON_ONCE (!state)) -return NULL ; - -if (state->pads) { -if (stream) -return NULL ; - -if (pad >= state->sd->entity.num_pads) -return NULL ; - -return &state->pads[pad].crop; - } - -lockdep_assert_held (state->lock); - - stream_configs = &state->stream_configs; - -for (i =0 ; i < stream_configs->num_configs; ++i) { -if (stream_configs->configs[i].pad == pad && - stream_configs->configs[i].stream == stream) -return &stream_configs->configs[i].crop; - } - -return NULL ; -} -EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_crop); - -struct v4l2_rect * -__v4l2_subdev_state_get_compose (struct v4l2_subdev_state *state, -unsigned int pad,u32 stream) -{ -struct v4l2_subdev_stream_configs *stream_configs; -unsigned int i; - -if (WARN_ON_ONCE (!state)) -return NULL ; - -if (state->pads) { -if (stream) -return NULL ; - -if (pad >= state->sd->entity.num_pads) -return NULL ; - -return &state->pads[pad].compose; - } - -lockdep_assert_held (state->lock); - - stream_configs = &state->stream_configs; - -for (i =0 ; i < stream_configs->num_configs; ++i) { -if (stream_configs->configs[i].pad == pad && - stream_configs->configs[i].stream == stream) -return &stream_configs->configs[i].compose; - } - -return NULL ; -} -EXPORT_SYMBOL_GPL (__v4l2_subdev_state_get_compose); -int v4l2_subdev_routing_find_opposite_end (const struct v4l2_subdev_krouting *routing,u32 pad,u32 stream,u32 *other_pad,u32 *other_stream)include/media/v4l2-subdev.h +64
-64@@ -1393,70 +1393,6 @@ v4l2_subdev_lock_and_get_active_state(struct v4l2_subdev *sd)return sd->active_state; } -#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API ) - -/** -* v4l2_subdev_get_fmt() - Fill format based on state -* @sd: subdevice -* @state: subdevice state -* @format: pointer to &struct v4l2_subdev_format -* -* Fill @format->format field based on the information in the @format struct. -* -* This function can be used by the subdev drivers which support active state to -* implement v4l2_subdev_pad_ops.get_fmt if the subdev driver does not need to -* do anything special in their get_fmt op. -* -* Returns 0 on success, error value otherwise. -*/ -int v4l2_subdev_get_fmt (struct v4l2_subdev *sd,struct v4l2_subdev_state *state, -struct v4l2_subdev_format *format); - -/** -* v4l2_subdev_set_routing() - Set given routing to subdev state -* @sd: The subdevice -* @state: The subdevice state -* @routing: Routing that will be copied to subdev state -* -* This will release old routing table (if any) from the state, allocate -* enough space for the given routing, and copy the routing. -* -* This can be used from the subdev driver's set_routing op, after validating -* the routing. -*/ -int v4l2_subdev_set_routing (struct v4l2_subdev *sd, -struct v4l2_subdev_state *state, -const struct v4l2_subdev_krouting *routing); - -struct v4l2_subdev_route * -__v4l2_subdev_next_active_route (const struct v4l2_subdev_krouting *routing, -struct v4l2_subdev_route *route); - -/** -* for_each_active_route - iterate on all active routes of a routing table -* @routing: The routing table -* @route: The route iterator -*/ -#define for_each_active_route (routing, route) \ - for ((route) = NULL; \ - ((route) = __v4l2_subdev_next_active_route((routing), (route)));) - -/** -* v4l2_subdev_set_routing_with_fmt() - Set given routing and format to subdev -* state -* @sd: The subdevice -* @state: The subdevice state -* @routing: Routing that will be copied to subdev state -* @fmt: Format used to initialize all the streams -* -* This is the same as v4l2_subdev_set_routing, but additionally initializes -* all the streams using the given format. -*/ -int v4l2_subdev_set_routing_with_fmt (struct v4l2_subdev *sd, -struct v4l2_subdev_state *state, -const struct v4l2_subdev_krouting *routing, -const struct v4l2_mbus_framefmt *fmt); -/* * A macro to generate the macro or function name for sub-devices state access * wrapper macros below. @@ -1533,6 +1469,70 @@ struct v4l2_rect * __v4l2_subdev_state_get_compose(struct v4l2_subdev_state *state, unsigned int pad, u32 stream); +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API ) + +/** +* v4l2_subdev_get_fmt() - Fill format based on state +* @sd: subdevice +* @state: subdevice state +* @format: pointer to &struct v4l2_subdev_format +* +* Fill @format->format field based on the information in the @format struct. +* +* This function can be used by the subdev drivers which support active state to +* implement v4l2_subdev_pad_ops.get_fmt if the subdev driver does not need to +* do anything special in their get_fmt op. +* +* Returns 0 on success, error value otherwise. +*/ +int v4l2_subdev_get_fmt (struct v4l2_subdev *sd,struct v4l2_subdev_state *state, +struct v4l2_subdev_format *format); + +/** +* v4l2_subdev_set_routing() - Set given routing to subdev state +* @sd: The subdevice +* @state: The subdevice state +* @routing: Routing that will be copied to subdev state +* +* This will release old routing table (if any) from the state, allocate +* enough space for the given routing, and copy the routing. +* +* This can be used from the subdev driver's set_routing op, after validating +* the routing. +*/ +int v4l2_subdev_set_routing (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state, +const struct v4l2_subdev_krouting *routing); + +struct v4l2_subdev_route * +__v4l2_subdev_next_active_route (const struct v4l2_subdev_krouting *routing, +struct v4l2_subdev_route *route); + +/** +* for_each_active_route - iterate on all active routes of a routing table +* @routing: The routing table +* @route: The route iterator +*/ +#define for_each_active_route (routing, route) \ + for ((route) = NULL; \ + ((route) = __v4l2_subdev_next_active_route((routing), (route)));) + +/** +* v4l2_subdev_set_routing_with_fmt() - Set given routing and format to subdev +* state +* @sd: The subdevice +* @state: The subdevice state +* @routing: Routing that will be copied to subdev state +* @fmt: Format used to initialize all the streams +* +* This is the same as v4l2_subdev_set_routing, but additionally initializes +* all the streams using the given format. +*/ +int v4l2_subdev_set_routing_with_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state, +const struct v4l2_subdev_krouting *routing, +const struct v4l2_mbus_framefmt *fmt); +/** * v4l2_subdev_routing_find_opposite_end() - Find the opposite stream * @routing: routing used to find the opposite side
Signature · 3 lines
Regards, Laurent Pinchart
Hi Laurent,
Quoted 10 lines · Laurent Pinchart
Hi Sakari,
Thank you for the patch.
Quoted 3 lines · Sakari Ailus
Compile sub-device state information access functions v4l2_subdev_state_get_{format,crop,compose} unconditionally as they are now also used by plain V4L2 drivers.
What do you mean by "plain" V4L2 drivers here ?
Those that do not need MC: if you now disable MC in kernel configuration, these functions won't be available.
Signature · 1 line
Sakari Ailus
Hi Sakari,
Quoted 10 lines · Sakari Ailus
Quoted 6 lines · Laurent Pinchart
Quoted 3 lines · Sakari Ailus
Compile sub-device state information access functions v4l2_subdev_state_get_{format,crop,compose} unconditionally as they are now also used by plain V4L2 drivers.
What do you mean by "plain" V4L2 drivers here ?
Those that do not need MC: if you now disable MC in kernel configuration, these functions won't be available.
This covers subdev drivers (such as sensor drivers) too, not just host drivers ? If so, shouldn't we also drop the dependency on VIDEO_V4L2_SUBDEV_API from drivers/media/i2c/Kconfig ?
Signature · 3 lines
Regards, Laurent Pinchart
Hi Laurent,
Quoted 9 lines · Laurent Pinchart
Hi Sakari,
Quoted 6 lines · Sakari Ailus
Quoted 5 lines · Laurent Pinchart
Quoted 3 lines · Sakari Ailus
Compile sub-device state information access functions v4l2_subdev_state_get_{format,crop,compose} unconditionally as they are now also used by plain V4L2 drivers.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
What do you mean by "plain" V4L2 drivers here ?
Those that do not need MC: if you now disable MC in kernel configuration, these functions won't be available.
This covers subdev drivers (such as sensor drivers) too, not just host drivers ? If so, shouldn't we also drop the dependency on
VIDEO_V4L2_SUBDEV_APIfromdrivers/media/i2c/Kconfig?
Good question.
There are still other functions that a number of drivers depend on which are only available when either MC or sub-device API are enabled.
Given that almost all receiver drivers today use MC, I don't think there would be much to be gained from enabling building e.g. sensor drivers without sub-device UAPI.
Signature · 3 lines
Regards, Sakari Ailus
Quoted 17 lines · Sakari Ailus
Quoted 7 lines · Laurent Pinchart
Quoted 6 lines · Sakari Ailus
Quoted 5 lines · Laurent Pinchart
Quoted 3 lines · Sakari Ailus
Compile sub-device state information access functions v4l2_subdev_state_get_{format,crop,compose} unconditionally as they are now also used by plain V4L2 drivers.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
What do you mean by "plain" V4L2 drivers here ?
Those that do not need MC: if you now disable MC in kernel configuration, these functions won't be available.
This covers subdev drivers (such as sensor drivers) too, not just host drivers ? If so, shouldn't we also drop the dependency on
VIDEO_V4L2_SUBDEV_APIfromdrivers/media/i2c/Kconfig?
Quoted 8 lines
Good question.
There are still other functions that a number of drivers depend on which are only available when either MC or sub-device API are enabled.
Given that almost all receiver drivers today use MC, I don't think there would be much to be gained from enabling building e.g. sensor drivers without sub-device UAPI.
I would like to refocus VIDEO_V4L2_SUBDEV_API to cover the UAPI only. Trying to be too clever with the Kconfig symbol doesn't help.
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 23 lines · Laurent Pinchart
Quoted 22 lines · Sakari Ailus
Quoted 7 lines · Laurent Pinchart
Quoted 6 lines · Sakari Ailus
Quoted 5 lines · Laurent Pinchart
Quoted 3 lines · Sakari Ailus
Compile sub-device state information access functions v4l2_subdev_state_get_{format,crop,compose} unconditionally as they are now also used by plain V4L2 drivers.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
What do you mean by "plain" V4L2 drivers here ?
Those that do not need MC: if you now disable MC in kernel configuration, these functions won't be available.
This covers subdev drivers (such as sensor drivers) too, not just host drivers ? If so, shouldn't we also drop the dependency on
VIDEO_V4L2_SUBDEV_APIfromdrivers/media/i2c/Kconfig?Good question.
There are still other functions that a number of drivers depend on which are only available when either MC or sub-device API are enabled.
Quoted 6 lines
Quoted 3 lines
Given that almost all receiver drivers today use MC, I don't think there would be much to be gained from enabling building e.g. sensor drivers without sub-device UAPI.
I would like to refocus
VIDEO_V4L2_SUBDEV_APIto cover the UAPI only. Trying to be too clever with theKconfigsymbol doesn't help.
I guess this has been the intention, with the inclusion of other functions and definitions that are only needed for sub-device UAPI. This poses some issues for drivers that can work in both cases but there aren't many of them. I'm fine with removing the latter.
Signature · 1 line
Sakari Ailus