linux-stable.git/include/media/v4l2-subdev.h, branch linux-6.9.y

media: v4l2-subdev: Store frame interval in subdev state

2023-12-13T15:52:35+00:00

Subdev states store all standard pad configuration data, except for
frame intervals. Fix it by adding interval fields in the
v4l2_subdev_pad_config and v4l2_subdev_stream_config structures, with
corresponding accessor functions and a helper function to implement the
.get_frame_interval() operation.

Signed-off-by: Laurent Pinchart 
Signed-off-by: Hans Verkuil

media: v4l2-subdev: Turn .[gs]_frame_interval into pad operations

2023-12-13T15:52:35+00:00

The subdev .[gs]_frame_interval are video operations, but they operate
on pads (and even on streams). Not only is this confusing, it causes
practical issues for drivers as the operations don't receive a subdev
state pointer, requiring manual state handling.

To improve the situation, turn the operations into pad operations, and
extend them to receive a state pointer like other pad operations.

While at it, rename the operations to .[gs]et_frame_interval at the same
time to match the naming scheme of other pad operations. This isn't
strictly necessary, but given that all drivers using those operations
need to be modified, handling the rename separately would generate more
churn for very little gain (if at all).

Signed-off-by: Laurent Pinchart 
Reviewed-by: Hans Verkuil 
Reviewed-by: Philipp Zabel  # for imx-media
Reviewed-by: Luca Ceresoli  # for tegra-video
Signed-off-by: Hans Verkuil

media: v4l: subdev: Move out subdev state lock macros outside CONFIG_MEDIA_CONTROLLER

2023-12-13T15:52:34+00:00

The subdev state locking macros and macros to get the active state are
currently behind CONFIG_MEDIA_CONTROLLER. This makes sense, as there can
be no subdev state without MC.

However, we have code paths common to MC and non-MC cases which call
subdev operations that have subdev state as a parameter. In the non-MC
case the state parameter would always be NULL.

Thus it makes sense to allow, e.g.:

v4l2_subdev_call_state_active(sd, pad, get_fmt, fmt)

which for non-MC case would call the subdev passing NULL as the state.

This currently fails:
https://lore.kernel.org/oe-kbuild-all/202312061101.PLrz5NnJ-lkp@intel.com/

Fix the issue by moving the related macros to be outside
CONFIG_MEDIA_CONTROLLER. The v4l2_subdev_lock_state() and
v4l2_subdev_unlock_state() macros will crash if given NULL as the state,
but the other macros behave correctly even when there's no active state,
and they will only call the lock/unlock macros if there is a state.

An alternative fix would be to make another version of
v4l2_subdev_call_state_try() with ifdefs, which would not use any state
macros and would always pass NULL as the state. But having two version
of a macro/function is always more confusing than having just one, so I
went this way.

So, this fixes the v4l2_subdev_call_state_active() macro. But we also
have v4l2_subdev_call_state_try(). It would be possible to fix that
macro by additionally creating "no-op" variants of the state alloc and
free functions. However, v4l2_subdev_call_state_try() is only used by a
single driver (stm32-dcmi), which selects MC, and the macro is supposed
to be removed as soon as the users have been converted away from the
macro. Thus I have not touched the state alloc/free functions, and I
think it makes sense to keep alloc/free functions available only if
there's actually something that can be allocated or freed.

Signed-off-by: Tomi Valkeinen
Reviewed-by: Laurent Pinchart
Reviewed-by: Hans Verkuil
Link: https://lore.kernel.org/r/20231208-v4l2-state-mc-fix-v1-1-a0c8162557c6@ideasonboard.com
Signed-off-by: Laurent Pinchart
Signed-off-by: Hans Verkuil

media: v4l2-subdev: Rename .init_cfg() operation to .init_state()

2023-12-04T09:37:47+00:00

The subdev .init_cfg() operation is affected by two issues:

- It has long been extended to initialize a whole v4l2_subdev_state
  instead of just a v4l2_subdev_pad_config, but its name has stuck
  around.

- Despite operating on a whole subdev state and not being directly
  exposed to the subdev users (either in-kernel or through the userspace
  API), .init_cfg() is categorized as a subdev pad operation.

This participates in making the subdev API confusing for new developers.
Fix it by renaming the operation to .init_state(), and make it a subdev
internal operation.

Signed-off-by: Laurent Pinchart 
Acked-by: Michael Riesch  # for imx415
Acked-by: Shuah Khan  # for vimc
Reviewed-by: Philipp Zabel 
Reviewed-by: Tomi Valkeinen 
[Sakari Ailus: Resolved a conflict in Renesas vsp1 driver.]
Signed-off-by: Sakari Ailus 
Signed-off-by: Hans Verkuil

media: v4l: subdev: Remove stream-unaware sub-device state access

2023-11-23T17:58:38+00:00

Remove stream-unaware sub-device state access functions and macros. These
are no longer used.

[Sakari Ailus: Resolve a minor conflict in removed code.]

Signed-off-by: Sakari Ailus 
Reviewed-by: Laurent Pinchart 
Signed-off-by: Mauro Carvalho Chehab

media: v4l: subdev: Always compile sub-device state access functions

2023-11-23T17:48:03+00:00

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.

Signed-off-by: Sakari Ailus 
Signed-off-by: Mauro Carvalho Chehab

media: v4l: subdev: Make stream argument optional in state access functions

2023-11-23T17:47:07+00:00

The sub-device state access functions take three arguments: sub-device
state, pad and stream. The stream is not relevant for the majority of
drivers and having to specify 0 for the stream is considered a nuisance.

Provide a two-argument macros for these state access functions to cover
the needs of stream-unaware users.

Signed-off-by: Sakari Ailus 
Reviewed-by: Laurent Pinchart 
Signed-off-by: Mauro Carvalho Chehab

media: v4l: subdev: Rename sub-device state information access functions

2023-11-23T17:32:17+00:00

Rename the sub-devices state information access functions, removing
"_stream" from them and replacing "format" by "ffmt". This makes them
shorter and so more convenient to use. No other sets of functions will be
needed to access this information.

Signed-off-by: Sakari Ailus 
Reviewed-by: Laurent Pinchart 
Reviewed-by: Tomi Valkeinen 
Signed-off-by: Mauro Carvalho Chehab

media: v4l: subdev: Also return pads array information on stream functions

2023-11-23T17:31:19+00:00

There are two sets of functions that return information from sub-device
state, one for stream-unaware users and another for stream-aware users.
Add support for stream-aware functions to return format, crop and compose
information from pad-based array that are functionally equivalent to the
old, stream-unaware ones.

Also check state is non-NULL, in order to guard against old drivers
potentially calling this with NULL state for active formats or selection
rectangles.

Signed-off-by: Sakari Ailus 
Reviewed-by: Laurent Pinchart 
Reviewed-by: Tomi Valkeinen 
Signed-off-by: Mauro Carvalho Chehab

media: v4l: subdev: Store the sub-device in the sub-device state

2023-11-23T17:30:41+00:00

Store the sub-device in the sub-device state. This will be needed in e.g.
validating pad number when retrieving information for non-stream-aware
users. There are expected to be more needs for this in the future.

Signed-off-by: Sakari Ailus 
Reviewed-by: Laurent Pinchart 
Reviewed-by: Tomi Valkeinen 
Signed-off-by: Mauro Carvalho Chehab