Separate links and async sub-devices
Subsystems (49)
Sakari Ailus
maintainerv6 cover Separate links and async sub-devices
Hi all,
This set adds support for multiple downstream links in an async sub-device, by separating the sub-device registration from the link creation.
A new concept, V4L2 async connection is added. A connection later on translates to an MC ancillary or data link. Generally async notifiers have a number of connections but at that level there is no knowledge of how many sub-devices they will connect to. The bound and unbound callbacks now work on connections. For the existing drivers there's only one connection so I do not expect regressions because of that.
Async sub-device fwnode matching will now take place between the device (the dev field of struct v4l2_subdev) and a struct v4l2_async_connection (an endpoint for devices that have endpoints or the device for those that do not). This is because the graph data structure only describes point-to-point connections so therefore defining one end of the connection defines the entire connection.
This set is unlikely to address all needs people have related to the async framework but I think that beyond what it does, it paves some way for addressing more of those additional needs.
To be frank, I'd like to get rid of the entire V4L2 async framework, but it would require allowing much more dynamic driver initialisation, including sub-devices and device nodes popping up in the system in the order and extent there is successfully probed hardware. Until that, and this may well be the entire foreseeable future, we have at least some of this complexity.
This has been tested on ipu3-cio2, i.MX6Q + tc358743, rcar-vin + adv746x, omap3isp + CCS and Renesas RZ/G2L SMARC, two of which (i.MX6 and adv746x) have never worked at the same time without kernel changes for one or the other.
The code also can be found in my async-multi branch, on media tree master.
since v5:
- Convert new V4L2 async API usage in ds9ub9xx and atomisp bridge drivers.
- Rebased on the current media stage tree.
since v4:
- Fixed Tested-by: tags (thanks to Prabhakar).
- Fixed platform_data pointer use/assignment order in davinci driver.
since v3:
- Improve V4L2 async documentation (a few new patches):
- Add subsections
- Document sub-device notifiers and sensor driver async helper
- Some overall improvements
- Document the need for calling v4l2_async_nf_cleanup() to release notifier resources
- Fix bugs in the example (it wouldn't compile)
- Remove redundant forward declarations in drivers/media/platform/atmel/atmel-isi.h and include/media/v4l2-fwnode.h (two new patches).
- Register IRQ just before registering the async notifier in pxa_camera_probe().
- Drop now-obsolete comment in drivers/media/platform/marvell/mcam-core.c.
- Fixes in V4L2 async kerneldoc (wrong field names and changes from subdevices to connections).
- Fix async notifier initialisation in drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c . The driver can act as both a master or a sub-notifier.
- Move link creation from complete to bound in omap3isp. Also addresses issues in having sub-notifiers introduced earlier version of this set.
- Small comment changes based on Laurent's review.
- Move patch dropping initialising sub-device's async list later as it cannot safely be applied as early as it was.
- Search the entire async match list for duplicate entries.
since v2:
- Drop the sub-devices (struct v4l2_async_subdev) earlier re-introduced in this patchset. They aren't necessary, instead we can use struct v4l2_subdev to store the information. This simplifies the code quite a bit, including removal of one of the global lists: only the sub-device and notifier lists are left now. The sub-device is assigned to the connection at the bound time: information on which sub-devices are connected via async connections is only actually available at the time of binding.
- Address issues related to sub-device handling in the rcar-vin driver. Also other fixes to the rcar-vin driver (bugs introduced in v2).
- Remove sub-device's notifier field, including an omap3isp patch removing an unnecessary test.
- Drop support for async sub-device side endpoint matching. Convert NXP imx-mipi-csis.
since v1:
- Fixed object relation issues. The set has now been tested on an async sub-device with two pads connected by data links to sub-devices on a notifier (struct) device. (Multiple notifiers should work, too, but has not been tested.)
- Add a function to obtain an async connection based on the sub-device. This is useful for drivers for accessing their own link specific data.
- Improved documentation. Include a patch documenting v4l2_async_nf_add_fwnode().
- Return endpoint matching and address adv748x driver breakage in v1. It's a special case so other drivers can remain simpler.
- Swap notifier initialisation arguments, by making the notifier the first argument.
- Remove extra fwnode_handle_put() in max9286_v4l2_unregister().
- Make struct device available before notifier initialisation for consistent debug messages.
- Simplify notifier and async sub-device linked lists. Consistent list head and list entry naming.
- Drop leftovers from an early experimenation work in rkisp1 and omap3isp drivers.
- Simplify xilinx-vipp sub-device binding.
- Use if()s in notifier_dev() of v4l2-async.c.
- Improved debug messages in v4l2-async.c, use v4l2-async prefix and generally with notifier device.
- Call match types with macros V4L2_ASYNC_MATCH_TYPE_* (was V4L2_ASYNC_MATCH_*).
- Create ancillary links only when the sub-device is registered, not when a connection is bound (which can take place more than once for a sub-device).
- Rename struct v4l2_async_match as v4l2_async_match_desc.
- Perform list initialisation in notifier init rather than registration.
- Get rid of the "readd" parameter for v4l2_async_nf_unbind_all_subdevs().
- Check async sub-device validity on a notifier only when the notifier is registered. This removes extra list traversal and simplifies the code.
- Remove extra list initialisation in v4l2_async_register_subdev().
- Drop v4l2_async_cleanup(). It was no longer useful, called from a single place.
- Lots of kerneldoc fixes (mostly changed argument names).
since RFC v1:
- Address missing API usage changes in a lot of drivers.
- Fix compilation problems in intermediate patches.
- Move V4L2 device registration earlier or move notifier initialisation and fwnode endpoint parsing past the current V4L2 device registration (patches 11--16).
Jacopo Mondi (1):
media: v4l: async: Drop v4l2_async_nf_parse_fwnode_endpoints()
Sakari Ailus (37):
media: v4l: fwnode: Remove unneeded forward declaration
media: atmel-isi: Remote unneeeded forward declaration
media: xilinx-vipp: Clean up bound async notifier callback
media: omap3isp: Move link creation to bound callback
media: Documentation: v4l: Fix async notifier registration example
media: Documentation: v4l: Add section titles for async
media: Documentation: v4l: Fix async sensor subdev helper
documentation
media: Documentation: v4l: Document missing async subdev function
media: Documentation: v4l: Document v4l2_async_nf_cleanup
media: v4l: async: Add some debug prints
media: v4l: async: Clean up testing for duplicate async subdevs
media: v4l: async: Don't check whether asd is NULL in validity check
media: v4l: async: Make V4L2 async match information a struct
media: v4l: async: Rename V4L2_ASYNC_MATCH_ macros, add TYPE_
media: v4l: async: Only pass match information for async subdev
validation
media: v4l: async: Clean up list heads and entries
media: v4l: async: Simplify async sub-device fwnode matching
media: v4l: async: Rename v4l2_async_subdev as v4l2_async_connection
media: v4l: async: Clean up error handling in v4l2_async_match_notify
media: v4l: async: Drop duplicate handling when adding connections
media: v4l: async: Rework internal lists
media: v4l: async: Obtain async connection based on sub-device
media: v4l: async: Allow multiple connections between entities
media: v4l: async: Drop unneeded list entry initialisation
media: v4l: async: Try more connections
media: v4l: async: Support fwnode endpoint list matching for subdevs
media: adv748x: Return to endpoint matching
media: pxa_camera: Fix probe error handling
media: pxa_camera: Register V4L2 device early
media: marvell: cafe: Register V4L2 device earlier
media: am437x-vpfe: Register V4L2 device early
media: omap3isp: Initialise V4L2 async notifier later
media: xilinx-vipp: Init async notifier after registering V4L2 device
media: davinci: Init async notifier after registering V4L2 device
media: qcom: Initialise V4L2 async notifier later
media: v4l: async: Set v4l2_device and subdev in async notifier init
media: Documentation: v4l: Document sub-device notifiers
.../driver-api/media/v4l2-subdev.rst | 110 ++- drivers/media/i2c/adv748x/adv748x-csi2.c | 13 +- drivers/media/i2c/ds90ub913.c | 10 +- drivers/media/i2c/ds90ub953.c | 10 +- drivers/media/i2c/ds90ub960.c | 12 +- drivers/media/i2c/max9286.c | 27 +- drivers/media/i2c/rdacm20.c | 16 +- drivers/media/i2c/rdacm21.c | 15 +- drivers/media/i2c/st-mipid02.c | 12 +- drivers/media/i2c/tc358746.c | 15 +- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 14 +- drivers/media/platform/atmel/atmel-isi.c | 12 +- drivers/media/platform/atmel/atmel-isi.h | 2 - drivers/media/platform/cadence/cdns-csi2rx.c | 10 +- drivers/media/platform/intel/pxa_camera.c | 77 +- drivers/media/platform/marvell/cafe-driver.c | 18 +- drivers/media/platform/marvell/mcam-core.c | 15 +- drivers/media/platform/marvell/mmp-driver.c | 6 +- .../platform/microchip/microchip-csi2dc.c | 11 +- .../platform/microchip/microchip-isc-base.c | 4 +- .../media/platform/microchip/microchip-isc.h | 2 +- .../microchip/microchip-sama5d2-isc.c | 9 +- .../microchip/microchip-sama7g5-isc.c | 9 +- drivers/media/platform/nxp/imx-mipi-csis.c | 17 +- drivers/media/platform/nxp/imx7-media-csi.c | 10 +- .../platform/nxp/imx8-isi/imx8-isi-core.c | 12 +- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 10 +- drivers/media/platform/qcom/camss/camss.c | 26 +- drivers/media/platform/qcom/camss/camss.h | 2 +- drivers/media/platform/renesas/rcar-isp.c | 12 +- .../platform/renesas/rcar-vin/rcar-core.c | 52 +- .../platform/renesas/rcar-vin/rcar-csi2.c | 20 +- .../platform/renesas/rcar-vin/rcar-vin.h | 10 +- drivers/media/platform/renesas/rcar_drif.c | 12 +- drivers/media/platform/renesas/renesas-ceu.c | 10 +- .../platform/renesas/rzg2l-cru/rzg2l-core.c | 14 +- .../platform/renesas/rzg2l-cru/rzg2l-cru.h | 2 +- .../platform/renesas/rzg2l-cru/rzg2l-csi2.c | 12 +- .../platform/rockchip/rkisp1/rkisp1-common.h | 2 +- .../platform/rockchip/rkisp1/rkisp1-csi.c | 7 +- .../platform/rockchip/rkisp1/rkisp1-dev.c | 12 +- .../platform/rockchip/rkisp1/rkisp1-isp.c | 8 +- .../platform/samsung/exynos4-is/media-dev.c | 11 +- .../platform/samsung/exynos4-is/media-dev.h | 2 +- drivers/media/platform/st/stm32/stm32-dcmi.c | 12 +- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 10 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 12 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 2 +- .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 10 +- .../sun8i_a83t_mipi_csi2.c | 10 +- .../media/platform/ti/am437x/am437x-vpfe.c | 36 +- .../media/platform/ti/am437x/am437x-vpfe.h | 2 +- drivers/media/platform/ti/cal/cal.c | 10 +- .../media/platform/ti/davinci/vpif_capture.c | 35 +- drivers/media/platform/ti/omap3isp/isp.c | 55 +- drivers/media/platform/ti/omap3isp/isp.h | 15 +- drivers/media/platform/ti/omap3isp/ispccdc.c | 13 +- drivers/media/platform/ti/omap3isp/ispccp2.c | 2 + drivers/media/platform/ti/omap3isp/ispcsi2.c | 2 + .../media/platform/ti/omap3isp/ispcsiphy.c | 15 +- drivers/media/platform/video-mux.c | 10 +- drivers/media/platform/xilinx/xilinx-vipp.c | 55 +- drivers/media/v4l2-core/v4l2-async.c | 689 ++++++++++-------- drivers/media/v4l2-core/v4l2-fwnode.c | 109 +-- drivers/media/v4l2-core/v4l2-subdev.c | 13 + .../media/atomisp/pci/atomisp_csi2_bridge.c | 8 +- .../staging/media/atomisp/pci/atomisp_v4l2.c | 2 +- .../media/deprecated/atmel/atmel-isc-base.c | 4 +- .../media/deprecated/atmel/atmel-isc.h | 2 +- .../deprecated/atmel/atmel-sama5d2-isc.c | 9 +- .../deprecated/atmel/atmel-sama7g5-isc.c | 9 +- drivers/staging/media/imx/imx-media-csi.c | 10 +- .../staging/media/imx/imx-media-dev-common.c | 6 +- drivers/staging/media/imx/imx-media-dev.c | 2 +- drivers/staging/media/imx/imx-media-of.c | 4 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 12 +- .../media/sunxi/sun6i-isp/sun6i_isp_proc.c | 6 +- .../media/sunxi/sun6i-isp/sun6i_isp_proc.h | 2 +- drivers/staging/media/tegra-video/vi.c | 21 +- include/media/davinci/vpif_types.h | 2 +- include/media/v4l2-async.h | 238 +++--- include/media/v4l2-fwnode.h | 70 -- include/media/v4l2-subdev.h | 19 +- 83 files changed, 1075 insertions(+), 1160 deletions(-)
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 1/38 media: v4l: async: Drop v4l2_async_nf_parse_fwnode_endpoints()
From: Jacopo Mondi <[email protected]>
The v4l2_async_nf_parse_fwnode_endpoints() function, part of v4l2-fwnode.c, was a helper meant to register one async sub-dev for each fwnode endpoint of a device.
The function is marked as deprecated in the documentation and is actually not used anywhere anymore. Drop it and remove the helper function v4l2_async_nf_fwnode_parse_endpoint() from v4l2-fwnode.c.
This change allows to make the helper function __v4l2_async_nf_add_connection() visibility private to v4l2-async.c so that there is no risk drivers can mistakenly use it.
--- drivers/media/v4l2-core/v4l2-async.c | 6 +- drivers/media/v4l2-core/v4l2-fwnode.c | 97 --------------------------- include/media/v4l2-async.h | 34 ++-------- include/media/v4l2-fwnode.h | 68 ------------------- 4 files changed, 7 insertions(+), 198 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +3 -3
@@ -662,8 +662,9 @@ void v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier) }EXPORT_SYMBOL_GPL (v4l2_async_nf_cleanup); -int __v4l2_async_nf_add_subdev (struct v4l2_async_notifier *notifier, -struct v4l2_async_subdev *asd) + +static int __v4l2_async_nf_add_subdev (struct v4l2_async_notifier *notifier, +struct v4l2_async_subdev *asd) {int ret;
@@ -679,7 +680,6 @@ int __v4l2_async_nf_add_subdev(struct v4l2_async_notifier *notifier,mutex_unlock (&list_lock);return ret; } -EXPORT_SYMBOL_GPL (__v4l2_async_nf_add_subdev);struct v4l2_async_subdev * __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier,
drivers/media/v4l2-core/v4l2-fwnode.c +0 -97
103 lines not on this page · raw message
include/media/v4l2-async.h +4 -30
@@ -131,32 +131,10 @@ void v4l2_async_debug_init(struct dentry *debugfs_dir);* * This function initializes the notifier @asd_list. It must be called * before adding a subdevice to a notifier, using one of: -* v4l2_async_nf_add_fwnode_remote(), -* v4l2_async_nf_add_fwnode(), -* v4l2_async_nf_add_i2c(), -* __v4l2_async_nf_add_subdev() or -* v4l2_async_nf_parse_fwnode_endpoints(). -*/ -void v4l2_async_nf_init (struct v4l2_async_notifier *notifier); - -/** -* __v4l2_async_nf_add_subdev - Add an async subdev to the -* notifier's master asd list. -* -* @notifier: pointer to &struct v4l2_async_notifier -* @asd: pointer to &struct v4l2_async_subdev -* -* \warning: Drivers should avoid using this function and instead use one of: -* v4l2_async_nf_add_fwnode(), -* v4l2_async_nf_add_fwnode_remote() or +* v4l2_async_nf_add_fwnode_remote(), v4l2_async_nf_add_fwnode() or * v4l2_async_nf_add_i2c(). -* -* Call this function before registering a notifier to link the provided @asd to -* the notifiers master @asd_list. The @asd must be allocated with k*alloc() as -* it will be freed by the framework when the notifier is destroyed. */ -int __v4l2_async_nf_add_subdev (struct v4l2_async_notifier *notifier, -struct v4l2_async_subdev *asd); +void v4l2_async_nf_init (struct v4l2_async_notifier *notifier);struct v4l2_async_subdev * __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier,
@@ -263,12 +241,8 @@ void v4l2_async_nf_unregister(struct v4l2_async_notifier *notifier);* Release memory resources related to a notifier, including the async * sub-devices allocated for the purposes of the notifier but not the notifier * itself. The user is responsible for calling this function to clean up the -* notifier after calling -* v4l2_async_nf_add_fwnode_remote(), -* v4l2_async_nf_add_fwnode(), -* v4l2_async_nf_add_i2c(), -* __v4l2_async_nf_add_subdev() or -* v4l2_async_nf_parse_fwnode_endpoints(). +* notifier after calling v4l2_async_nf_add_fwnode_remote(), +* v4l2_async_nf_add_fwnode() or v4l2_async_nf_add_i2c(). * * There is no harm from calling v4l2_async_nf_cleanup() in other * cases as long as its memory has been zeroed after it has been
include/media/v4l2-fwnode.h +0 -68
80 lines not on this page · raw message
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 2/38 media: v4l: fwnode: Remove unneeded forward declaration
In reply to Sakari AilusRemove an unneeded declaration for struct fwnode_handle.
--- include/media/v4l2-fwnode.h | 2 -- 1 file changed, 2 deletions(-)
include/media/v4l2-fwnode.h +0 -2
@@ -21,8 +21,6 @@#include <media/v4l2-mediabus.h> -struct fwnode_handle ; -/** * struct v4l2_fwnode_endpoint - the endpoint data structure * @base: fwnode endpoint of the v4l2_fwnode
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 3/38 media: atmel-isi: Remote unneeeded forward declaration
In reply to Sakari AilusRemove an unneeded forward declaration for struct v4l2_async_subdev.
--- drivers/media/platform/atmel/atmel-isi.h | 2 -- 1 file changed, 2 deletions(-)
drivers/media/platform/atmel/atmel-isi.h +0 -2
@@ -121,8 +121,6 @@#define ISI_DATAWIDTH_8 0x01#define ISI_DATAWIDTH_10 0x02 -struct v4l2_async_subdev ; -struct isi_platform_data {u8 has_emb_sync;u8 hsync_act_low;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 4/38 media: xilinx-vipp: Clean up bound async notifier callback
In reply to Sakari AilusThe async notifier bound callback does a lot of checks that have probably been always unnecessary. Remove the lookup of the async subev that we already have, as well as the debug print that is already printed by the framework.
--- drivers/media/platform/xilinx/xilinx-vipp.c | 32 ++++----------------- 1 file changed, 5 insertions(+), 27 deletions(-)
drivers/media/platform/xilinx/xilinx-vipp.c +5 -27
@@ -312,36 +312,14 @@ static int xvip_graph_notify_complete(struct v4l2_async_notifier *notifier)static int xvip_graph_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *unused) +struct v4l2_async_subdev *asd) { -struct xvip_composite_device *xdev = - container_of(notifier, struct xvip_composite_device, notifier); -struct xvip_graph_entity *entity; -struct v4l2_async_subdev *asd; +struct xvip_graph_entity *entity =to_xvip_entity (asd); -/* Locate the entity corresponding to the bound subdev and store the -* subdev pointer. -*/ -list_for_each_entry (asd, &xdev->notifier.asd_list, asd_list) { - entity =to_xvip_entity (asd); + entity->entity = &subdev->entity; + entity->subdev = subdev; -if (entity->asd.match.fwnode != subdev->fwnode) -continue ; - -if (entity->subdev) { -dev_err (xdev->dev,"duplicate subdev for node %p\n" , - entity->asd.match.fwnode); -return -EINVAL ; - } - -dev_dbg (xdev->dev,"subdev %s bound\n" , subdev->name); - entity->entity = &subdev->entity; - entity->subdev = subdev; -return 0 ; - } - -dev_err (xdev->dev,"no entity for subdev %s\n" , subdev->name); -return -EINVAL ; +return 0 ; }static const struct v4l2_async_notifier_operations xvip_graph_notify_ops = {
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 5/38 media: omap3isp: Move link creation to bound callback
In reply to Sakari AilusMove the creation of the links between external sub-devices and ISP sub-devices to the bound callback. This way we can also remove the need to access the sub-device's notifier field that will soon be removed.
--- drivers/media/platform/ti/omap3isp/isp.c | 38 ++++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/media/platform/ti/omap3isp/isp.c +19 -19
@@ -2022,35 +2022,34 @@ enum isp_of_phy { ISP_OF_PHY_CSIPHY2, }; -static int isp_subdev_notifier_complete (struct v4l2_async_notifier *async) +static int isp_subdev_notifier_bound (struct v4l2_async_notifier *async, +struct v4l2_subdev *sd, +struct v4l2_async_subdev *asd) { struct isp_device *isp = container_of(async, struct isp_device, notifier); -struct v4l2_device *v4l2_dev = &isp->v4l2_dev; -struct v4l2_subdev *sd; +struct isp_bus_cfg *bus_cfg = + &container_of(asd, struct isp_async_subdev, asd)->bus;int ret;mutex_lock (&isp->media_dev.graph_mutex); + ret =isp_link_entity (isp, &sd->entity, bus_cfg->interface); +mutex_unlock (&isp->media_dev.graph_mutex); - ret =media_entity_enum_init (&isp->crashed, &isp->media_dev); -if (ret) { -mutex_unlock (&isp->media_dev.graph_mutex); -return ret; - } - -list_for_each_entry (sd, &v4l2_dev->subdevs, list) { -if (sd->notifier != &isp->notifier) -continue ; +return ret; +} - ret =isp_link_entity (isp, &sd->entity, -v4l2_subdev_to_bus_cfg (sd)->interface); -if (ret <0 ) { -mutex_unlock (&isp->media_dev.graph_mutex); -return ret; - } - } +static int isp_subdev_notifier_complete (struct v4l2_async_notifier *async) +{ + struct isp_device *isp = container_of(async, struct isp_device, + notifier); +int ret; +mutex_lock (&isp->media_dev.graph_mutex); + ret =media_entity_enum_init (&isp->crashed, &isp->media_dev);mutex_unlock (&isp->media_dev.graph_mutex); +if (ret) +return ret; ret =v4l2_device_register_subdev_nodes (&isp->v4l2_dev);if (ret <0 )
@@ -2240,6 +2239,7 @@ static int isp_parse_of_endpoints(struct isp_device *isp) }static const struct v4l2_async_notifier_operations isp_subdev_notifier_ops = { + .bound = isp_subdev_notifier_bound, .complete = isp_subdev_notifier_complete, };
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 6/38 media: Documentation: v4l: Fix async notifier registration example
In reply to Sakari AilusAn example adding an async sub-device to a V4L2 async notifier. The name of the variable in error handling was wrong (asd vs. my_asd).
--- Documentation/driver-api/media/v4l2-subdev.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/driver-api/media/v4l2-subdev.rst +2 -2
@@ -234,8 +234,8 @@ These functions allocate an async sub-device descriptor which is of type struct struct my_async_subdev); fwnode_handle_put(ep); - if (IS_ERR(asd)) - return PTR_ERR(asd); + if (IS_ERR(my_asd)) + return PTR_ERR(my_asd); The V4L2 core will then use these descriptors to match asynchronously registered subdevices to them. If a match is detected the ``.bound()``
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 7/38 media: Documentation: v4l: Add section titles for async
In reply to Sakari AilusAdd section titles for async documentation. While the documentation is mostly fine as-is, it has grown from its original state but remains without internal structure. Add it now.
Also remove an extra newline.
--- .../driver-api/media/v4l2-subdev.rst | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
Documentation/driver-api/media/v4l2-subdev.rst +18 -1
@@ -157,6 +157,9 @@ below. Using one or the other registration method only affects the probing process, the run-time bridge-subdevice interaction is in both cases the same. +Registering synchronous sub-devices +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + In the **synchronous** case a device (bridge) driver needs to register the :c:type:`v4l2_subdev` with the v4l2_device:
@@ -175,10 +178,12 @@ You can unregister a sub-device using: :c:func:`v4l2_device_unregister_subdev <v4l2_device_unregister_subdev>` (:c:type:`sd <v4l2_subdev>`). - Afterwards the subdev module can be unloaded and :c:type:`sd <v4l2_subdev>`->dev == ``NULL``. +Registering asynchronous sub-devices +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + In the **asynchronous** case subdevice probing can be invoked independently of the bridge driver availability. The subdevice driver then has to verify whether all the requirements for a successful probing are satisfied. This can include a
@@ -190,6 +195,9 @@ performed using the :c:func:`v4l2_async_unregister_subdev` call. Subdevices registered this way are stored in a global list of subdevices, ready to be picked up by bridge drivers. +Asynchronous sub-device notifiers +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + Bridge drivers in turn have to register a notifier object. This is performed using the :c:func:`v4l2_async_nf_register` call. To unregister the notifier the driver has to call
@@ -208,12 +216,18 @@ the needs of the driver. :c:func:`v4l2_async_nf_add_i2c` are for bridge and ISP drivers for registering their async sub-devices with the notifier. +Asynchronous sub-device registration helper for camera sensor drivers +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + :c:func:`v4l2_async_register_subdev_sensor` is a helper function for sensor drivers registering their own async sub-device, but it also registers a notifier and further registers async sub-devices for lens and flash devices found in firmware. The notifier for the sub-device is unregistered with the async sub-device. +Asynchronous sub-device notifier example +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + These functions allocate an async sub-device descriptor which is of type struct :c:type:`v4l2_async_subdev` embedded in a driver-specific struct. The &struct :c:type:`v4l2_async_subdev` shall be the first member of this struct:
@@ -237,6 +251,9 @@ These functions allocate an async sub-device descriptor which is of type struct if (IS_ERR(my_asd)) return PTR_ERR(my_asd); +Asynchronous sub-device notifier callbacks +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + The V4L2 core will then use these descriptors to match asynchronously registered subdevices to them. If a match is detected the ``.bound()`` notifier callback is called. After all subdevices have been located the
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 8/38 media: Documentation: v4l: Fix async sensor subdev helper documentation
In reply to Sakari AilusDocumentat that the notifier of an async sub-device is, besider unregistered, also cleaned up using v4l2_async_unregister_subdev().
--- Documentation/driver-api/media/v4l2-subdev.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Documentation/driver-api/media/v4l2-subdev.rst +5 -5
@@ -219,11 +219,11 @@ registering their async sub-devices with the notifier. Asynchronous sub-device registration helper for camera sensor drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -:c:func:`v4l2_async_register_subdev_sensor` is a helper function for -sensor drivers registering their own async sub-device, but it also registers a -notifier and further registers async sub-devices for lens and flash devices -found in firmware. The notifier for the sub-device is unregistered with the -async sub-device. +:c:func:`v4l2_async_register_subdev_sensor` is a helper function for sensor +drivers registering their own async sub-device, but it also registers a notifier +and further registers async sub-devices for lens and flash devices found in +firmware. The notifier for the sub-device is unregistered and cleaned up with +the async sub-device, using :c:func:`v4l2_async_unregister_subdev`. Asynchronous sub-device notifier example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 9/38 media: Documentation: v4l: Document missing async subdev function
In reply to Sakari AilusAlso v4l2_async_nf_add_fwnode() may be used to add an async sub-device descriptor to a notifier. Document this. Also remove a redundant sentence.
--- Documentation/driver-api/media/v4l2-subdev.rst | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
Documentation/driver-api/media/v4l2-subdev.rst +5 -9
@@ -206,15 +206,11 @@ takes two arguments: a pointer to struct :c:type:`v4l2_device` and a pointer to struct :c:type:`v4l2_async_notifier`. Before registering the notifier, bridge drivers must do two things: first, the -notifier must be initialized using the :c:func:`v4l2_async_nf_init`. -Second, bridge drivers can then begin to form a list of subdevice descriptors -that the bridge device needs for its operation. Several functions are available -to add subdevice descriptors to a notifier, depending on the type of device and -the needs of the driver. - -:c:func:`v4l2_async_nf_add_fwnode_remote` and -:c:func:`v4l2_async_nf_add_i2c` are for bridge and ISP drivers for -registering their async sub-devices with the notifier. +notifier must be initialized using the :c:func:`v4l2_async_nf_init`. Second, +bridge drivers can then begin to form a list of subdevice descriptors that the +bridge device needs for its operation. :c:func:`v4l2_async_nf_add_fwnode`, +:c:func:`v4l2_async_nf_add_fwnode_remote` and :c:func:`v4l2_async_nf_add_i2c` +are available for that purpose. Asynchronous sub-device registration helper for camera sensor drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 10/38 media: Documentation: v4l: Document v4l2_async_nf_cleanup
In reply to Sakari AilusDocument v4l2_async_nf_cleanup() which must be called before releasing an unregistered notifier's memory. Also remove the sentence regarding v4l2_async_nf_init() arguments --- those are documented in kerneldoc which is referred here.
--- Documentation/driver-api/media/v4l2-subdev.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
Documentation/driver-api/media/v4l2-subdev.rst +5 -6
@@ -198,12 +198,11 @@ picked up by bridge drivers. Asynchronous sub-device notifiers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Bridge drivers in turn have to register a notifier object. This is -performed using the :c:func:`v4l2_async_nf_register` call. To -unregister the notifier the driver has to call -:c:func:`v4l2_async_nf_unregister`. The former of the two functions -takes two arguments: a pointer to struct :c:type:`v4l2_device` and a -pointer to struct :c:type:`v4l2_async_notifier`. +Bridge drivers in turn have to register a notifier object. This is performed +using the :c:func:`v4l2_async_nf_register` call. To unregister the notifier the +driver has to call :c:func:`v4l2_async_nf_unregister`. Before releasing memory +of an unregister notifier, it must be cleaned up by calling +:c:func:`v4l2_async_nf_cleanup`. Before registering the notifier, bridge drivers must do two things: first, the notifier must be initialized using the :c:func:`v4l2_async_nf_init`. Second,
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 11/38 media: v4l: async: Add some debug prints
In reply to Sakari AilusJust add some debug prints for V4L2 async sub-device matching process. These might come useful in figuring out why things don't work as expected.
--- drivers/media/v4l2-core/v4l2-async.c | 71 ++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 8 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +63 -8
@@ -77,6 +77,17 @@ static bool match_i2c(struct v4l2_async_notifier *notifier,#endif } +static struct device *notifier_dev (struct v4l2_async_notifier *notifier) +{ +if (notifier->sd) +return notifier->sd->dev; + +if (notifier->v4l2_dev) +return notifier->v4l2_dev->dev; + +return NULL ; +} + static bool match_fwnode_one(struct v4l2_async_notifier *notifier, struct v4l2_subdev *sd, struct fwnode_handle *sd_fwnode,
@@ -88,13 +99,20 @@ match_fwnode_one(struct v4l2_async_notifier *notifier,bool sd_fwnode_is_ep;struct device *dev; +dev_dbg (notifier_dev (notifier), +"v4l2-async: fwnode match: need %pfw, trying %pfw\n" , + sd_fwnode, asd->match.fwnode); +/* * Both the subdev and the async subdev can provide either an endpoint * fwnode or a device fwnode. Start with the simple case of direct * fwnode matching. */ -if (sd_fwnode == asd->match.fwnode) +if (sd_fwnode == asd->match.fwnode) { +dev_dbg (notifier_dev (notifier), +"v4l2-async: direct match found\n" );return true; + }/* * Otherwise, check if the sd fwnode and the asd fwnode refer to an
@@ -107,8 +125,11 @@ match_fwnode_one(struct v4l2_async_notifier *notifier, sd_fwnode_is_ep =fwnode_graph_is_endpoint (sd_fwnode); asd_fwnode_is_ep =fwnode_graph_is_endpoint (asd->match.fwnode); -if (sd_fwnode_is_ep == asd_fwnode_is_ep) +if (sd_fwnode_is_ep == asd_fwnode_is_ep) { +dev_dbg (notifier_dev (notifier), +"v4l2-async: direct match not found\n" );return false; + }/* * The sd and asd fwnodes are of different types. Get the device fwnode
@@ -122,10 +143,17 @@ match_fwnode_one(struct v4l2_async_notifier *notifier, other_fwnode = sd_fwnode; } +dev_dbg (notifier_dev (notifier), +"v4l2-async: fwnode compat match: need %pfw, trying %pfw\n" , + dev_fwnode, other_fwnode); +fwnode_handle_put (dev_fwnode); -if (dev_fwnode != other_fwnode) +if (dev_fwnode != other_fwnode) { +dev_dbg (notifier_dev (notifier), +"v4l2-async: compat match not found\n" );return false; + }/* * We have a heterogeneous match. Retrieve the struct device of the side
@@ -145,12 +173,18 @@ match_fwnode_one(struct v4l2_async_notifier *notifier, dev->driver->name); } +dev_dbg (notifier_dev (notifier),"v4l2-async: compat match found\n" ); +return true; }static bool match_fwnode (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd,struct v4l2_async_subdev *asd) { +dev_dbg (notifier_dev (notifier), +"v4l2-async: matching for notifier %pfw, sd fwnode %pfw\n" , +dev_fwnode (notifier_dev (notifier)), sd->fwnode); +if (match_fwnode_one (notifier, sd, sd->fwnode, asd))return true;
@@ -158,6 +192,9 @@ static bool match_fwnode(struct v4l2_async_notifier *notifier,if (IS_ERR_OR_NULL (sd->fwnode->secondary))return false; +dev_dbg (notifier_dev (notifier), +"v4l2-async: trying secondary fwnode match\n" ); +return match_fwnode_one (notifier, sd, sd->fwnode->secondary, asd); }
@@ -271,22 +308,33 @@ v4l2_async_nf_can_complete(struct v4l2_async_notifier *notifier)static int v4l2_async_nf_try_complete (struct v4l2_async_notifier *notifier) { +struct v4l2_async_notifier *__notifier = notifier; +/* Quick check whether there are still more sub-devices here. */ if (!list_empty (¬ifier->waiting))return 0 ; +if (notifier->sd) +dev_dbg (notifier_dev (notifier), +"v4l2-async: trying to complete\n" ); +/* Check the entire notifier tree; find the root notifier first. */ while (notifier->parent) notifier = notifier->parent;/* This is root if it has v4l2_dev. */ -if (!notifier->v4l2_dev) +if (!notifier->v4l2_dev) { +dev_dbg (notifier_dev (__notifier), +"v4l2-async: V4L2 device not available\n" );return 0 ; + }/* Is everything ready? */ if (!v4l2_async_nf_can_complete (notifier))return 0 ; +dev_dbg (notifier_dev (__notifier),"v4l2-async: complete\n" ); +return v4l2_async_nf_call_complete (notifier); }
@@ -350,6 +398,9 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,/* Move from the global subdevice list to notifier's done */ list_move (&sd->async_list, ¬ifier->done); +dev_dbg (notifier_dev (notifier),"v4l2-async: %s bound (ret %d)\n" , +dev_name (sd->dev), ret); +/* * See if the sub-device has a notifier. If not, return here. */
@@ -378,6 +429,8 @@ v4l2_async_nf_try_all_subdevs(struct v4l2_async_notifier *notifier)if (!v4l2_dev)return 0 ; +dev_dbg (notifier_dev (notifier),"v4l2-async: trying all sub-devices\n" ); + again:list_for_each_entry (sd, &subdev_list, async_list) {struct v4l2_async_subdev *asd;
@@ -387,6 +440,9 @@ v4l2_async_nf_try_all_subdevs(struct v4l2_async_notifier *notifier)if (!asd)continue ; +dev_dbg (notifier_dev (notifier), +"v4l2-async: match found, subdev %s\n" , sd->name); + ret =v4l2_async_match_notify (notifier, v4l2_dev, sd, asd);if (ret <0 )return ret;
@@ -496,8 +552,7 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier, struct v4l2_async_subdev *asd, int this_index) { -struct device *dev = - notifier->v4l2_dev ? notifier->v4l2_dev->dev :NULL ; +struct device *dev =notifier_dev (notifier);if (!asd)return -EINVAL ;
@@ -506,12 +561,12 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier,case V4L2_ASYNC_MATCH_I2C :case V4L2_ASYNC_MATCH_FWNODE :if (v4l2_async_nf_has_async_subdev (notifier, asd, this_index)) { -dev_dbg (dev,"subdev descriptor already listed in this or other notifiers\n" ); +dev_dbg (dev,"v4l2-async: subdev descriptor already listed in a notifier\n" );return -EEXIST ; }break ;default : -dev_err (dev,"Invalid match type %u on %p\n" , +dev_err (dev,"v4l2-async: Invalid match type %u on %p\n" , asd->match_type, asd);return -EINVAL ; }
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 12/38 media: v4l: async: Clean up testing for duplicate async subdevs
In reply to Sakari AilusThere's a need to verify that a single async sub-device isn't being added multiple times, this would be an error. This takes place at the time of adding the async sub-device to the notifier's list as well as when the notifier is added to the global notifier's list.
Use the pointer to the sub-device for testing this instead of an index to an array that is long gone. (There was an array of async sub-devices in the notifier before it was converted to a linked list by commit 66beb323e4a0 ("media: v4l2: async: Remove notifier subdevs array").)
--- drivers/media/v4l2-core/v4l2-async.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +12 -12
@@ -519,23 +519,23 @@ __v4l2_async_nf_has_async_subdev(struct v4l2_async_notifier *notifier, }/* -* Find out whether an async sub-device was set up already or -* whether it exists in a given notifier before @this_index. -* If @this_index < 0, search the notifier's entire @asd_list. +* Find out whether an async sub-device was set up already or whether it exists +* in a given notifier. The skip_self argument is used to skip testing the same +* sub-device in the notifier in case the sub-device has been already added to +* the notifier. */ static bool v4l2_async_nf_has_async_subdev (struct v4l2_async_notifier *notifier, -struct v4l2_async_subdev *asd,int this_index) +struct v4l2_async_subdev *asd,bool skip_self) {struct v4l2_async_subdev *asd_y; -int j =0 ;lockdep_assert_held (&list_lock);/* Check that an asd is not being added more than once. */ list_for_each_entry (asd_y, ¬ifier->asd_list, asd_list) { -if (this_index >=0 && j++ >= this_index) -break ; +if (skip_self && asd == asd_y) +continue ;if (asd_equal (asd, asd_y))return true; }
@@ -550,7 +550,7 @@ v4l2_async_nf_has_async_subdev(struct v4l2_async_notifier *notifier,static int v4l2_async_nf_asd_valid (struct v4l2_async_notifier *notifier,struct v4l2_async_subdev *asd, -int this_index) +bool skip_self) {struct device *dev =notifier_dev (notifier);
@@ -560,7 +560,7 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier,switch (asd->match_type) {case V4L2_ASYNC_MATCH_I2C :case V4L2_ASYNC_MATCH_FWNODE : -if (v4l2_async_nf_has_async_subdev (notifier, asd, this_index)) { +if (v4l2_async_nf_has_async_subdev (notifier, asd, skip_self)) {dev_dbg (dev,"v4l2-async: subdev descriptor already listed in a notifier\n" );return -EEXIST ; }
@@ -583,7 +583,7 @@ EXPORT_SYMBOL(v4l2_async_nf_init);static int __v4l2_async_nf_register (struct v4l2_async_notifier *notifier) {struct v4l2_async_subdev *asd; -int ret, i =0 ; +int ret;INIT_LIST_HEAD (¬ifier->waiting);INIT_LIST_HEAD (¬ifier->done);
@@ -591,7 +591,7 @@ static int __v4l2_async_nf_register(struct v4l2_async_notifier *notifier)mutex_lock (&list_lock);list_for_each_entry (asd, ¬ifier->asd_list, asd_list) { - ret =v4l2_async_nf_asd_valid (notifier, asd, i++); + ret =v4l2_async_nf_asd_valid (notifier, asd, true);if (ret) goto err_unlock;
@@ -725,7 +725,7 @@ static int __v4l2_async_nf_add_subdev(struct v4l2_async_notifier *notifier,mutex_lock (&list_lock); - ret =v4l2_async_nf_asd_valid (notifier, asd,-1 ); + ret =v4l2_async_nf_asd_valid (notifier, asd, false);if (ret) goto unlock;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 13/38 media: v4l: async: Don't check whether asd is NULL in validity check
In reply to Sakari AilusThe callers do pass a non-NULL asd to v4l2_async_nf_asd_valid() already. There's no need for the NULL check here.
--- drivers/media/v4l2-core/v4l2-async.c | 3 --- 1 file changed, 3 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +0 -3
@@ -554,9 +554,6 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier, {struct device *dev =notifier_dev (notifier); -if (!asd) -return -EINVAL ; -switch (asd->match_type) {case V4L2_ASYNC_MATCH_I2C :case V4L2_ASYNC_MATCH_FWNODE :
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 14/38 media: v4l: async: Make V4L2 async match information a struct
In reply to Sakari AilusMake V4L2 async match information a struct, making it easier to use it elsewhere outside the scope of struct v4l2_async_subdev.
Also remove an obsolete comment --- none of these fields are supposed to be touched by drivers.
--- drivers/media/v4l2-core/v4l2-async.c | 18 ++++++------ include/media/v4l2-async.h | 41 ++++++++++++++++------------ 2 files changed, 32 insertions(+), 27 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +9 -9
@@ -212,7 +212,7 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier,list_for_each_entry (asd, ¬ifier->waiting, list) {/* bus_type has been verified valid before */ -switch (asd->match_type) { +switch (asd->match.type) {case V4L2_ASYNC_MATCH_I2C : match = match_i2c;break ;
@@ -237,10 +237,10 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier,static bool asd_equal (struct v4l2_async_subdev *asd_x,struct v4l2_async_subdev *asd_y) { -if (asd_x->match_type != asd_y->match_type) +if (asd_x->match.type != asd_y->match.type)return false; -switch (asd_x->match_type) { +switch (asd_x->match.type) {case V4L2_ASYNC_MATCH_I2C :return asd_x->match.i2c.adapter_id == asd_y->match.i2c.adapter_id &&
@@ -554,7 +554,7 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier, {struct device *dev =notifier_dev (notifier); -switch (asd->match_type) { +switch (asd->match.type) {case V4L2_ASYNC_MATCH_I2C :case V4L2_ASYNC_MATCH_FWNODE :if (v4l2_async_nf_has_async_subdev (notifier, asd, skip_self)) {
@@ -564,7 +564,7 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier,break ;default :dev_err (dev,"v4l2-async: Invalid match type %u on %p\n" , - asd->match_type, asd); + asd->match.type, asd);return -EINVAL ; }
@@ -690,7 +690,7 @@ static void __v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier)return ;list_for_each_entry_safe (asd, tmp, ¬ifier->asd_list, asd_list) { -switch (asd->match_type) { +switch (asd->match.type) {case V4L2_ASYNC_MATCH_FWNODE :fwnode_handle_put (asd->match.fwnode);break ;
@@ -745,7 +745,7 @@ __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier,if (!asd)return ERR_PTR (-ENOMEM ); - asd->match_type =V4L2_ASYNC_MATCH_FWNODE ; + asd->match.type =V4L2_ASYNC_MATCH_FWNODE ; asd->match.fwnode =fwnode_handle_get (fwnode); ret =__v4l2_async_nf_add_subdev (notifier, asd);
@@ -792,7 +792,7 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, int adapter_id,if (!asd)return ERR_PTR (-ENOMEM ); - asd->match_type =V4L2_ASYNC_MATCH_I2C ; + asd->match.type =V4L2_ASYNC_MATCH_I2C ; asd->match.i2c.adapter_id = adapter_id; asd->match.i2c.address = address;
@@ -905,7 +905,7 @@ EXPORT_SYMBOL(v4l2_async_unregister_subdev);static void print_waiting_subdev (struct seq_file *s,struct v4l2_async_subdev *asd) { -switch (asd->match_type) { +switch (asd->match.type) {case V4L2_ASYNC_MATCH_I2C :seq_printf (s," [i2c] dev=%d-%04x\n" , asd->match.i2c.adapter_id, asd->match.i2c.address);
include/media/v4l2-async.h +23 -18
62 lines not on this page · raw message
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 15/38 media: v4l: async: Rename V4L2_ASYNC_MATCH_ macros, add TYPE_
In reply to Sakari AilusThe async match type is a struct field now, rename V4L2_ASYNC_MATCH_* macros as V4L2_ASYNC_MATCH_TYPE_* instead.
This patch has been produced by:
git grep -l V4L2_ASYNC_MATCH_ -- drivers/media/ drivers/staging/media/ \ include/ Documentation/|xargs perl -i -pe \ 's/V4L2_ASYNC_MATCH_\K/TYPE_/g'
so it must be correct.
--- drivers/media/v4l2-core/v4l2-async.c | 22 +++++++++++----------- include/media/v4l2-async.h | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +11 -11
@@ -213,10 +213,10 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier,list_for_each_entry (asd, ¬ifier->waiting, list) {/* bus_type has been verified valid before */ switch (asd->match.type) { -case V4L2_ASYNC_MATCH_I2C : +case V4L2_ASYNC_MATCH_TYPE_I2C : match = match_i2c;break ; -case V4L2_ASYNC_MATCH_FWNODE : +case V4L2_ASYNC_MATCH_TYPE_FWNODE : match = match_fwnode;break ;default :
@@ -241,12 +241,12 @@ static bool asd_equal(struct v4l2_async_subdev *asd_x,return false;switch (asd_x->match.type) { -case V4L2_ASYNC_MATCH_I2C : +case V4L2_ASYNC_MATCH_TYPE_I2C :return asd_x->match.i2c.adapter_id == asd_y->match.i2c.adapter_id && asd_x->match.i2c.address == asd_y->match.i2c.address; -case V4L2_ASYNC_MATCH_FWNODE : +case V4L2_ASYNC_MATCH_TYPE_FWNODE :return asd_x->match.fwnode == asd_y->match.fwnode;default :break ;
@@ -555,8 +555,8 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier,struct device *dev =notifier_dev (notifier);switch (asd->match.type) { -case V4L2_ASYNC_MATCH_I2C : -case V4L2_ASYNC_MATCH_FWNODE : +case V4L2_ASYNC_MATCH_TYPE_I2C : +case V4L2_ASYNC_MATCH_TYPE_FWNODE :if (v4l2_async_nf_has_async_subdev (notifier, asd, skip_self)) {dev_dbg (dev,"v4l2-async: subdev descriptor already listed in a notifier\n" );return -EEXIST ;
@@ -691,7 +691,7 @@ static void __v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier)list_for_each_entry_safe (asd, tmp, ¬ifier->asd_list, asd_list) {switch (asd->match.type) { -case V4L2_ASYNC_MATCH_FWNODE : +case V4L2_ASYNC_MATCH_TYPE_FWNODE :fwnode_handle_put (asd->match.fwnode);break ;default :
@@ -745,7 +745,7 @@ __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier,if (!asd)return ERR_PTR (-ENOMEM ); - asd->match.type =V4L2_ASYNC_MATCH_FWNODE ; + asd->match.type =V4L2_ASYNC_MATCH_TYPE_FWNODE ; asd->match.fwnode =fwnode_handle_get (fwnode); ret =__v4l2_async_nf_add_subdev (notifier, asd);
@@ -792,7 +792,7 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, int adapter_id,if (!asd)return ERR_PTR (-ENOMEM ); - asd->match.type =V4L2_ASYNC_MATCH_I2C ; + asd->match.type =V4L2_ASYNC_MATCH_TYPE_I2C ; asd->match.i2c.adapter_id = adapter_id; asd->match.i2c.address = address;
@@ -906,11 +906,11 @@ static void print_waiting_subdev(struct seq_file *s, struct v4l2_async_subdev *asd) {switch (asd->match.type) { -case V4L2_ASYNC_MATCH_I2C : +case V4L2_ASYNC_MATCH_TYPE_I2C :seq_printf (s," [i2c] dev=%d-%04x\n" , asd->match.i2c.adapter_id, asd->match.i2c.address);break ; -case V4L2_ASYNC_MATCH_FWNODE : { +case V4L2_ASYNC_MATCH_TYPE_FWNODE : {struct fwnode_handle *devnode, *fwnode = asd->match.fwnode; devnode = fwnode_graph_is_endpoint(fwnode) ?
include/media/v4l2-async.h +8 -8
@@ -22,15 +22,15 @@ struct v4l2_async_notifier;* enum v4l2_async_match_type - type of asynchronous subdevice logic to be used * in order to identify a match * -* @V4L2_ASYNC_MATCH_I2C: Match will check for I2C adapter ID and address -* @V4L2_ASYNC_MATCH_FWNODE: Match will use firmware node +* @V4L2_ASYNC_MATCH_TYPE_I2C: Match will check for I2C adapter ID and address +* @V4L2_ASYNC_MATCH_TYPE_FWNODE: Match will use firmware node * * This enum is used by the asynchronous sub-device logic to define the * algorithm that will be used to match an asynchronous device. */ enum v4l2_async_match_type { -V4L2_ASYNC_MATCH_I2C , -V4L2_ASYNC_MATCH_FWNODE , +V4L2_ASYNC_MATCH_TYPE_I2C , +V4L2_ASYNC_MATCH_TYPE_FWNODE , };/**
@@ -38,17 +38,17 @@ enum v4l2_async_match_type {* * @type: type of match that will be used * @fwnode: pointer to &struct fwnode_handle to be matched. -* Used if @match_type is %V4L2_ASYNC_MATCH_FWNODE. +* Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_FWNODE. * @i2c: embedded struct with I2C parameters to be matched. * Both @match.i2c.adapter_id and @match.i2c.address * should be matched. -* Used if @match_type is %V4L2_ASYNC_MATCH_I2C. +* Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C. * @i2c.adapter_id: * I2C adapter ID to be matched. -* Used if @match_type is %V4L2_ASYNC_MATCH_I2C. +* Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C. * @i2c.address: * I2C address to be matched. -* Used if @match_type is %V4L2_ASYNC_MATCH_I2C. +* Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C. */ struct v4l2_async_match_desc {enum v4l2_async_match_type type;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 16/38 media: v4l: async: Only pass match information for async subdev validation
In reply to Sakari AilusPass only information required for sub-device matching to functions checking whether the async sub-device already exists. Do the same for debug message printing. This makes further changes to other aspects of async sub-devices easier.
Accordingly, also perform further renames:
asd_equal as v4l2_async_match_equal, v4l2_async_nf_has_async_subdev as v4l2_async_nf_has_async_match, __v4l2_async_nf_has_async_subdev as
v4l2_async_nf_has_async_subdev_entry and
v4l2_async_nf_asd_valid as v4l2_async_nf_match_valid.
--- drivers/media/v4l2-core/v4l2-async.c | 109 ++++++++++++++------------- 1 file changed, 56 insertions(+), 53 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +56 -53
@@ -64,14 +64,15 @@ static void v4l2_async_nf_call_destroy(struct v4l2_async_notifier *n, }static bool match_i2c (struct v4l2_async_notifier *notifier, -struct v4l2_subdev *sd,struct v4l2_async_subdev *asd) +struct v4l2_subdev *sd, +struct v4l2_async_match_desc *match) {#if IS_ENABLED (CONFIG_I2C )struct i2c_client *client =i2c_verify_client (sd->dev);return client && - asd->match.i2c.adapter_id == client->adapter->nr && - asd->match.i2c.address == client->addr; + match->i2c.adapter_id == client->adapter->nr && + match->i2c.address == client->addr;#else return false;#endif
@@ -91,7 +92,7 @@ static struct device *notifier_dev(struct v4l2_async_notifier *notifier)static bool match_fwnode_one (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd,struct fwnode_handle *sd_fwnode, -struct v4l2_async_subdev *asd) +struct v4l2_async_match_desc *match) {struct fwnode_handle *other_fwnode;struct fwnode_handle *dev_fwnode;
@@ -101,14 +102,14 @@ match_fwnode_one(struct v4l2_async_notifier *notifier,dev_dbg (notifier_dev (notifier),"v4l2-async: fwnode match: need %pfw, trying %pfw\n" , - sd_fwnode, asd->match.fwnode); + sd_fwnode, match->fwnode);/* * Both the subdev and the async subdev can provide either an endpoint * fwnode or a device fwnode. Start with the simple case of direct * fwnode matching. */ -if (sd_fwnode == asd->match.fwnode) { +if (sd_fwnode == match->fwnode) {dev_dbg (notifier_dev (notifier),"v4l2-async: direct match found\n" );return true;
@@ -123,7 +124,7 @@ match_fwnode_one(struct v4l2_async_notifier *notifier,* match unconnected endpoints. */ sd_fwnode_is_ep =fwnode_graph_is_endpoint (sd_fwnode); - asd_fwnode_is_ep =fwnode_graph_is_endpoint (asd->match.fwnode); + asd_fwnode_is_ep =fwnode_graph_is_endpoint (match->fwnode);if (sd_fwnode_is_ep == asd_fwnode_is_ep) { dev_dbg(notifier_dev(notifier),
@@ -137,9 +138,9 @@ match_fwnode_one(struct v4l2_async_notifier *notifier,*/ if (sd_fwnode_is_ep) { dev_fwnode =fwnode_graph_get_port_parent (sd_fwnode); - other_fwnode = asd->match.fwnode; + other_fwnode = match->fwnode; }else { - dev_fwnode =fwnode_graph_get_port_parent (asd->match.fwnode); + dev_fwnode =fwnode_graph_get_port_parent (match->fwnode); other_fwnode = sd_fwnode; }
@@ -179,13 +180,14 @@ match_fwnode_one(struct v4l2_async_notifier *notifier, }static bool match_fwnode (struct v4l2_async_notifier *notifier, -struct v4l2_subdev *sd,struct v4l2_async_subdev *asd) +struct v4l2_subdev *sd, +struct v4l2_async_match_desc *match) {dev_dbg (notifier_dev (notifier),"v4l2-async: matching for notifier %pfw, sd fwnode %pfw\n" ,dev_fwnode (notifier_dev (notifier)), sd->fwnode); -if (match_fwnode_one (notifier, sd, sd->fwnode, asd)) +if (match_fwnode_one (notifier, sd, sd->fwnode, match))return true;/* Also check the secondary fwnode. */
@@ -195,7 +197,7 @@ static bool match_fwnode(struct v4l2_async_notifier *notifier,dev_dbg (notifier_dev (notifier),"v4l2-async: trying secondary fwnode match\n" ); -return match_fwnode_one (notifier, sd, sd->fwnode->secondary, asd); +return match_fwnode_one (notifier, sd, sd->fwnode->secondary, match); }static LIST_HEAD (subdev_list);
@@ -207,7 +209,8 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier, struct v4l2_subdev *sd) {bool (*match)(struct v4l2_async_notifier *notifier, -struct v4l2_subdev *sd,struct v4l2_async_subdev *asd); +struct v4l2_subdev *sd, +struct v4l2_async_match_desc *match);struct v4l2_async_subdev *asd;list_for_each_entry (asd, ¬ifier->waiting, list) {
@@ -226,28 +229,26 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier, }/* match cannot be NULL here */ -if (match (notifier, sd, asd)) +if (match (notifier, sd, &asd->match))return asd; }return NULL ; } -/* Compare two async sub-device descriptors for equivalence */ -static bool asd_equal (struct v4l2_async_subdev *asd_x, -struct v4l2_async_subdev *asd_y) +/* Compare two async match descriptors for equivalence */ +static bool v4l2_async_match_equal (struct v4l2_async_match_desc *match1, +struct v4l2_async_match_desc *match2) { -if (asd_x->match.type != asd_y->match.type) +if (match1->type != match2->type)return false; -switch (asd_x->match.type) { +switch (match1->type) {case V4L2_ASYNC_MATCH_TYPE_I2C : -return asd_x->match.i2c.adapter_id == - asd_y->match.i2c.adapter_id && - asd_x->match.i2c.address == - asd_y->match.i2c.address; +return match1->i2c.adapter_id == match2->i2c.adapter_id && + match1->i2c.address == match2->i2c.address;case V4L2_ASYNC_MATCH_TYPE_FWNODE : -return asd_x->match.fwnode == asd_y->match.fwnode; +return match1->fwnode == match2->fwnode;default :break ; }
@@ -497,21 +498,21 @@ v4l2_async_nf_unbind_all_subdevs(struct v4l2_async_notifier *notifier,/* See if an async sub-device can be found in a notifier's lists. */ static bool -__v4l2_async_nf_has_async_subdev (struct v4l2_async_notifier *notifier, -struct v4l2_async_subdev *asd) +v4l2_async_nf_has_async_match_entry (struct v4l2_async_notifier *notifier, +struct v4l2_async_match_desc *match) { -struct v4l2_async_subdev *asd_y; +struct v4l2_async_subdev *asd;struct v4l2_subdev *sd; -list_for_each_entry (asd_y, ¬ifier->waiting, list) -if (asd_equal (asd, asd_y)) +list_for_each_entry (asd, ¬ifier->waiting, list) +if (v4l2_async_match_equal (&asd->match, match))return true;list_for_each_entry (sd, ¬ifier->done, async_list) {if (WARN_ON (!sd->asd))continue ; -if (asd_equal (asd, sd->asd)) +if (v4l2_async_match_equal (&sd->asd->match, match))return true; }
@@ -525,46 +526,48 @@ __v4l2_async_nf_has_async_subdev(struct v4l2_async_notifier *notifier,* the notifier. */ static bool -v4l2_async_nf_has_async_subdev (struct v4l2_async_notifier *notifier, -struct v4l2_async_subdev *asd,bool skip_self) +v4l2_async_nf_has_async_match (struct v4l2_async_notifier *notifier, +struct v4l2_async_match_desc *match, +bool skip_self) { -struct v4l2_async_subdev *asd_y; +struct v4l2_async_subdev *asd;lockdep_assert_held (&list_lock);/* Check that an asd is not being added more than once. */ -list_for_each_entry (asd_y, ¬ifier->asd_list, asd_list) { -if (skip_self && asd == asd_y) +list_for_each_entry (asd, ¬ifier->asd_list, asd_list) { +if (skip_self && &asd->match == match)continue ; -if (asd_equal (asd, asd_y)) +if (v4l2_async_match_equal (&asd->match, match))return true; }/* Check that an asd does not exist in other notifiers. */ list_for_each_entry (notifier, ¬ifier_list, list) -if (__v4l2_async_nf_has_async_subdev (notifier, asd)) +if (v4l2_async_nf_has_async_match_entry (notifier, match))return true;return false; } -static int v4l2_async_nf_asd_valid (struct v4l2_async_notifier *notifier, -struct v4l2_async_subdev *asd, -bool skip_self) +static int v4l2_async_nf_match_valid (struct v4l2_async_notifier *notifier, +struct v4l2_async_match_desc *match, +bool skip_self) {struct device *dev =notifier_dev (notifier); -switch (asd->match.type) { +switch (match->type) {case V4L2_ASYNC_MATCH_TYPE_I2C :case V4L2_ASYNC_MATCH_TYPE_FWNODE : -if (v4l2_async_nf_has_async_subdev (notifier, asd, skip_self)) { -dev_dbg (dev,"v4l2-async: subdev descriptor already listed in a notifier\n" ); +if (v4l2_async_nf_has_async_match (notifier, match, + skip_self)) { +dev_dbg (dev,"v4l2-async: match descriptor already listed in a notifier\n" );return -EEXIST ; }break ;default :dev_err (dev,"v4l2-async: Invalid match type %u on %p\n" , - asd->match.type, asd); + match->type, match);return -EINVAL ; }
@@ -588,7 +591,7 @@ static int __v4l2_async_nf_register(struct v4l2_async_notifier *notifier)mutex_lock (&list_lock);list_for_each_entry (asd, ¬ifier->asd_list, asd_list) { - ret =v4l2_async_nf_asd_valid (notifier, asd, true); + ret =v4l2_async_nf_match_valid (notifier, &asd->match, true);if (ret) goto err_unlock;
@@ -722,7 +725,7 @@ static int __v4l2_async_nf_add_subdev(struct v4l2_async_notifier *notifier,mutex_lock (&list_lock); - ret =v4l2_async_nf_asd_valid (notifier, asd, false); + ret =v4l2_async_nf_match_valid (notifier, &asd->match, false);if (ret) goto unlock;
@@ -902,16 +905,16 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd) }EXPORT_SYMBOL (v4l2_async_unregister_subdev); -static void print_waiting_subdev (struct seq_file *s, -struct v4l2_async_subdev *asd) +static void print_waiting_match (struct seq_file *s, +struct v4l2_async_match_desc *match) { -switch (asd->match.type) { +switch (match->type) {case V4L2_ASYNC_MATCH_TYPE_I2C : -seq_printf (s," [i2c] dev=%d-%04x\n" , asd->match.i2c.adapter_id, - asd->match.i2c.address); +seq_printf (s," [i2c] dev=%d-%04x\n" , match->i2c.adapter_id, + match->i2c.address);break ;case V4L2_ASYNC_MATCH_TYPE_FWNODE : { -struct fwnode_handle *devnode, *fwnode = asd->match.fwnode; +struct fwnode_handle *devnode, *fwnode = match->fwnode; devnode =fwnode_graph_is_endpoint (fwnode) ? fwnode_graph_get_port_parent(fwnode) :
@@ -948,7 +951,7 @@ static int pending_subdevs_show(struct seq_file *s, void *data)list_for_each_entry (notif, ¬ifier_list, list) {seq_printf (s,"%s:\n" ,v4l2_async_nf_name (notif));list_for_each_entry (asd, ¬if->waiting, list) -print_waiting_subdev (s, asd); +print_waiting_match (s, &asd->match); }mutex_unlock (&list_lock);
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 17/38 media: v4l: async: Clean up list heads and entries
In reply to Sakari AilusThe naming of list heads and list entries is confusing as they're named similarly. Use _list for list head and _entry for list entries.
--- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- drivers/media/platform/xilinx/xilinx-vipp.c | 6 +-- drivers/media/v4l2-core/v4l2-async.c | 54 ++++++++++----------- drivers/staging/media/tegra-video/vi.c | 4 +- include/media/v4l2-async.h | 22 ++++----- include/media/v4l2-subdev.h | 4 +- 6 files changed, 46 insertions(+), 46 deletions(-)
drivers/media/pci/intel/ipu3/ipu3-cio2.c +1 -1
@@ -1421,7 +1421,7 @@ static int cio2_notifier_complete(struct v4l2_async_notifier *notifier)struct cio2_queue *q;int ret; -list_for_each_entry (asd, &cio2->notifier.asd_list, asd_list) { +list_for_each_entry (asd, &cio2->notifier.asd_list, asd_entry) { s_asd =to_sensor_asd (asd); q = &cio2->queue[s_asd->csi2.port];
drivers/media/platform/xilinx/xilinx-vipp.c +3 -3
@@ -56,7 +56,7 @@ xvip_graph_find_entity(struct xvip_composite_device *xdev,struct xvip_graph_entity *entity;struct v4l2_async_subdev *asd; -list_for_each_entry (asd, &xdev->notifier.asd_list, asd_list) { +list_for_each_entry (asd, &xdev->notifier.asd_list, asd_entry) { entity =to_xvip_entity (asd);if (entity->asd.match.fwnode == fwnode)return entity;
@@ -291,7 +291,7 @@ static int xvip_graph_notify_complete(struct v4l2_async_notifier *notifier)dev_dbg (xdev->dev,"notify complete, all subdevs registered\n" );/* Create links for every entity. */ -list_for_each_entry (asd, &xdev->notifier.asd_list, asd_list) { +list_for_each_entry (asd, &xdev->notifier.asd_list, asd_entry) { entity =to_xvip_entity (asd); ret =xvip_graph_build_one (xdev, entity);if (ret <0 )
@@ -393,7 +393,7 @@ static int xvip_graph_parse(struct xvip_composite_device *xdev)if (ret <0 )return 0 ; -list_for_each_entry (asd, &xdev->notifier.asd_list, asd_list) { +list_for_each_entry (asd, &xdev->notifier.asd_list, asd_entry) { entity =to_xvip_entity (asd); ret =xvip_graph_parse_one (xdev, entity->asd.match.fwnode);if (ret <0 ) {
drivers/media/v4l2-core/v4l2-async.c +27 -27
185 lines not on this page · raw message
drivers/staging/media/tegra-video/vi.c +2 -2
@@ -1464,7 +1464,7 @@ tegra_vi_graph_find_entity(struct tegra_vi_channel *chan,struct tegra_vi_graph_entity *entity;struct v4l2_async_subdev *asd; -list_for_each_entry (asd, &chan->notifier.asd_list, asd_list) { +list_for_each_entry (asd, &chan->notifier.asd_list, asd_entry) { entity =to_tegra_vi_graph_entity (asd);if (entity->asd.match.fwnode == fwnode)return entity;
@@ -1608,7 +1608,7 @@ static int tegra_vi_graph_notify_complete(struct v4l2_async_notifier *notifier) }/* create links between the entities */ -list_for_each_entry (asd, &chan->notifier.asd_list, asd_list) { +list_for_each_entry (asd, &chan->notifier.asd_list, asd_entry) { entity =to_tegra_vi_graph_entity (asd); ret =tegra_vi_graph_build (chan, entity);if (ret <0 )
include/media/v4l2-async.h +11 -11
@@ -65,10 +65,10 @@ struct v4l2_async_match_desc {* struct v4l2_async_subdev - sub-device descriptor, as known to a bridge * * @match: struct of match type and per-bus type matching data sets -* @asd_list: used to add struct v4l2_async_subdev objects to the +* @asd_entry: used to add struct v4l2_async_subdev objects to the * master notifier @asd_list -* @list: used to link struct v4l2_async_subdev objects, waiting to be -* probed, to a notifier->waiting list +* @waiting_entry: used to link struct v4l2_async_subdev objects, waiting to be +* probed, to a notifier->waiting_list list * * When this struct is used as a member in a driver specific struct, * the driver specific struct shall contain the &struct
@@ -76,8 +76,8 @@ struct v4l2_async_match_desc {*/ struct v4l2_async_subdev {struct v4l2_async_match_desc match; -struct list_head list; -struct list_head asd_list; +struct list_head asd_entry; +struct list_head waiting_entry; };/**
@@ -107,9 +107,9 @@ struct v4l2_async_notifier_operations {* @sd: sub-device that registered the notifier, NULL otherwise * @parent: parent notifier * @asd_list: master list of struct v4l2_async_subdev -* @waiting: list of struct v4l2_async_subdev, waiting for their drivers -* @done: list of struct v4l2_subdev, already probed -* @list: member in a global list of notifiers +* @waiting_list: list of struct v4l2_async_subdev, waiting for their drivers +* @done_list: list of struct v4l2_subdev, already probed +* @notifier_entry: member in a global list of notifiers */ struct v4l2_async_notifier {const struct v4l2_async_notifier_operations *ops;
@@ -117,9 +117,9 @@ struct v4l2_async_notifier {struct v4l2_subdev *sd;struct v4l2_async_notifier *parent;struct list_head asd_list; -struct list_head waiting; -struct list_head done; -struct list_head list; +struct list_head waiting_list; +struct list_head done_list; +struct list_head notifier_entry; };/**
include/media/v4l2-subdev.h +2 -2
@@ -1020,8 +1020,8 @@ struct v4l2_subdev_platform_data {* @dev: pointer to the physical device, if any * @fwnode: The fwnode_handle of the subdev, usually the same as * either dev->of_node->fwnode or dev->fwnode (whichever is non-NULL). -* @async_list: Links this subdev to a global subdev_list or @notifier->done -* list. +* @async_list: Links this subdev to a global subdev_list or +* @notifier->done_list list. * @asd: Pointer to respective &struct v4l2_async_subdev. * @notifier: Pointer to the managing notifier. * @subdev_notifier: A sub-device notifier implicitly registered for the sub-
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 18/38 media: v4l: async: Simplify async sub-device fwnode matching
In reply to Sakari AilusV4L2 async sub-device matching originally used the device nodes only. Endpoint nodes were taken into use instead as using the device nodes was problematic for it was in some cases ambiguous which link might have been in question.
There is however no need to use endpoint nodes on both sides, as the async sub-device's fwnode can always be trivially obtained using fwnode_graph_get_remote_endpoint() when needed while what counts is whether or not the link is between two device nodes, i.e. the device nodes match.
This will briefly break the adv748x driver but it will be fixed later in the set, by patch "media: adv748x: Return to endpoint matching".
--- drivers/media/i2c/adv748x/adv748x-csi2.c | 5 +- drivers/media/i2c/max9286.c | 14 +--- drivers/media/i2c/rdacm20.c | 16 +--- drivers/media/i2c/rdacm21.c | 15 +--- drivers/media/i2c/tc358746.c | 5 -- drivers/media/platform/nxp/imx-mipi-csis.c | 7 -- drivers/media/v4l2-core/v4l2-async.c | 88 ++++++---------------- 7 files changed, 26 insertions(+), 124 deletions(-)
drivers/media/i2c/adv748x/adv748x-csi2.c +2 -3
@@ -296,13 +296,12 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx)if (!is_tx_enabled (tx))return 0 ; +/* FIXME: Do endpoint matching again! */ +adv748x_subdev_init (&tx->sd, state, &adv748x_csi2_ops,MEDIA_ENT_F_VID_IF_BRIDGE ,is_txa (tx) ?"txa" :"txb" ); -/* Ensure that matching is based upon the endpoint fwnodes */ - tx->sd.fwnode =of_fwnode_handle (state->endpoints[tx->port]); -/* Register internal ops for incremental subdev registration */ tx->sd.internal_ops = &adv748x_csi2_internal_ops;
drivers/media/i2c/max9286.c +1 -13
@@ -1051,7 +1051,6 @@ static const struct v4l2_ctrl_ops max9286_ctrl_ops = {static int max9286_v4l2_register (struct max9286_priv *priv) {struct device *dev = &priv->client->dev; -struct fwnode_handle *ep;int ret;int i;
@@ -1093,25 +1092,14 @@ static int max9286_v4l2_register(struct max9286_priv *priv)if (ret) goto err_async; - ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (dev),MAX9286_SRC_PAD , -0 ,0 ); -if (!ep) { -dev_err (dev,"Unable to retrieve endpoint on \"port@4\"\n" ); - ret = -ENOENT ; - goto err_async; - } - priv->sd.fwnode = ep; - ret =v4l2_async_register_subdev (&priv->sd);if (ret <0 ) {dev_err (dev,"Unable to register subdevice\n" ); - goto err_put_node; + goto err_async; }return 0 ; -err_put_node: -fwnode_handle_put (ep); err_async:v4l2_ctrl_handler_free (&priv->ctrls);max9286_v4l2_notifier_unregister (priv);
drivers/media/i2c/rdacm20.c +1 -15
@@ -567,7 +567,6 @@ static int rdacm20_initialize(struct rdacm20_device *dev)static int rdacm20_probe (struct i2c_client *client) {struct rdacm20_device *dev; -struct fwnode_handle *ep;int ret; dev =devm_kzalloc (&client->dev,sizeof (*dev),GFP_KERNEL );
@@ -616,24 +615,12 @@ static int rdacm20_probe(struct i2c_client *client)if (ret <0 ) goto error_free_ctrls; - ep =fwnode_graph_get_next_endpoint (dev_fwnode (&client->dev),NULL ); -if (!ep) { -dev_err (&client->dev, -"Unable to get endpoint in node %pOF\n" , - client->dev.of_node); - ret = -ENOENT ; - goto error_free_ctrls; - } - dev->sd.fwnode = ep; - ret =v4l2_async_register_subdev (&dev->sd);if (ret) - goto error_put_node; + goto error_free_ctrls;return 0 ; -error_put_node: -fwnode_handle_put (ep); error_free_ctrls:v4l2_ctrl_handler_free (&dev->ctrls); error:
@@ -650,7 +637,6 @@ static void rdacm20_remove(struct i2c_client *client) {struct rdacm20_device *dev =i2c_to_rdacm20 (client); -fwnode_handle_put (dev->sd.fwnode);v4l2_async_unregister_subdev (&dev->sd);v4l2_ctrl_handler_free (&dev->ctrls);media_entity_cleanup (&dev->sd.entity);
drivers/media/i2c/rdacm21.c +1 -14
@@ -543,7 +543,6 @@ static int rdacm21_initialize(struct rdacm21_device *dev)static int rdacm21_probe (struct i2c_client *client) {struct rdacm21_device *dev; -struct fwnode_handle *ep;int ret; dev =devm_kzalloc (&client->dev,sizeof (*dev),GFP_KERNEL );
@@ -588,24 +587,12 @@ static int rdacm21_probe(struct i2c_client *client)if (ret <0 ) goto error_free_ctrls; - ep =fwnode_graph_get_next_endpoint (dev_fwnode (&client->dev),NULL ); -if (!ep) { -dev_err (&client->dev, -"Unable to get endpoint in node %pOF\n" , - client->dev.of_node); - ret = -ENOENT ; - goto error_free_ctrls; - } - dev->sd.fwnode = ep; - ret =v4l2_async_register_subdev (&dev->sd);if (ret) - goto error_put_node; + goto error_free_ctrls;return 0 ; -error_put_node: -fwnode_handle_put (dev->sd.fwnode); error_free_ctrls:v4l2_ctrl_handler_free (&dev->ctrls); error:
drivers/media/i2c/tc358746.c +0 -5
@@ -1476,9 +1476,6 @@ static int tc358746_async_register(struct tc358746 *tc358746)if (err) goto err_cleanup; - tc358746->sd.fwnode =fwnode_graph_get_endpoint_by_id ( -dev_fwnode (tc358746->sd.dev),TC358746_SOURCE ,0 ,0 ); - err =v4l2_async_register_subdev (&tc358746->sd);if (err) goto err_unregister;
@@ -1486,7 +1483,6 @@ static int tc358746_async_register(struct tc358746 *tc358746)return 0 ; err_unregister: -fwnode_handle_put (tc358746->sd.fwnode);v4l2_async_nf_unregister (&tc358746->notifier); err_cleanup:v4l2_async_nf_cleanup (&tc358746->notifier);
@@ -1605,7 +1601,6 @@ static void tc358746_remove(struct i2c_client *client)v4l2_fwnode_endpoint_free (&tc358746->csi_vep);v4l2_async_nf_unregister (&tc358746->notifier);v4l2_async_nf_cleanup (&tc358746->notifier); -fwnode_handle_put (sd->fwnode);v4l2_async_unregister_subdev (sd);media_entity_cleanup (&sd->entity);
drivers/media/platform/nxp/imx-mipi-csis.c +0 -7
@@ -1364,13 +1364,6 @@ static int mipi_csis_subdev_init(struct mipi_csis_device *csis) sd->dev = csis->dev; - sd->fwnode =fwnode_graph_get_endpoint_by_id (dev_fwnode (csis->dev), -1 ,0 ,0 ); -if (!sd->fwnode) { -dev_err (csis->dev,"Unable to retrieve endpoint for port@1\n" ); -return -ENOENT ; - } - csis->pads[CSIS_PAD_SINK ].flags =MEDIA_PAD_FL_SINK |MEDIA_PAD_FL_MUST_CONNECT ; csis->pads[CSIS_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE
drivers/media/v4l2-core/v4l2-async.c +21 -67
122 lines not on this page · raw message
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 19/38 media: v4l: async: Rename v4l2_async_subdev as v4l2_async_connection
In reply to Sakari AilusRename v4l2_async_subdev as v4l2_async_connection, in order to differentiate between the sub-devices and their connections: one sub-device can have many connections but the V4L2 async framework has so far allowed just a single one. Connections in this context will later translate into either MC ancillary or data links.
This patch prepares changing that relation by changing existing users of v4l2_async_subdev to switch to v4l2_async_connection. Async sub-devices themselves will not be needed anymore
Additionally, __v4l2_async_nf_add_subdev() has been renamed __v4l2_async_nf_add_connection().
--- .../driver-api/media/v4l2-subdev.rst | 51 +++--- drivers/media/i2c/ds90ub913.c | 6 +- drivers/media/i2c/ds90ub953.c | 6 +- drivers/media/i2c/ds90ub960.c | 8 +- drivers/media/i2c/max9286.c | 9 +- drivers/media/i2c/st-mipid02.c | 8 +- drivers/media/i2c/tc358746.c | 6 +- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 10 +- drivers/media/platform/atmel/atmel-isi.c | 8 +- drivers/media/platform/cadence/cdns-csi2rx.c | 6 +- drivers/media/platform/intel/pxa_camera.c | 12 +- drivers/media/platform/marvell/cafe-driver.c | 5 +- drivers/media/platform/marvell/mcam-core.c | 4 +- drivers/media/platform/marvell/mmp-driver.c | 4 +- .../platform/microchip/microchip-csi2dc.c | 6 +- .../platform/microchip/microchip-isc-base.c | 4 +- .../media/platform/microchip/microchip-isc.h | 2 +- .../microchip/microchip-sama5d2-isc.c | 4 +- .../microchip/microchip-sama7g5-isc.c | 4 +- drivers/media/platform/nxp/imx-mipi-csis.c | 6 +- drivers/media/platform/nxp/imx7-media-csi.c | 6 +- .../platform/nxp/imx8-isi/imx8-isi-core.c | 8 +- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 6 +- drivers/media/platform/qcom/camss/camss.c | 2 +- drivers/media/platform/qcom/camss/camss.h | 2 +- drivers/media/platform/renesas/rcar-isp.c | 8 +- .../platform/renesas/rcar-vin/rcar-core.c | 44 ++--- .../platform/renesas/rcar-vin/rcar-csi2.c | 16 +- .../platform/renesas/rcar-vin/rcar-vin.h | 10 +- drivers/media/platform/renesas/rcar_drif.c | 8 +- drivers/media/platform/renesas/renesas-ceu.c | 6 +- .../platform/renesas/rzg2l-cru/rzg2l-core.c | 10 +- .../platform/renesas/rzg2l-cru/rzg2l-cru.h | 2 +- .../platform/renesas/rzg2l-cru/rzg2l-csi2.c | 8 +- .../platform/rockchip/rkisp1/rkisp1-common.h | 2 +- .../platform/rockchip/rkisp1/rkisp1-dev.c | 8 +- .../platform/samsung/exynos4-is/media-dev.c | 6 +- .../platform/samsung/exynos4-is/media-dev.h | 2 +- drivers/media/platform/st/stm32/stm32-dcmi.c | 8 +- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 6 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 2 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 2 +- .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 6 +- .../sun8i_a83t_mipi_csi2.c | 6 +- .../media/platform/ti/am437x/am437x-vpfe.c | 5 +- .../media/platform/ti/am437x/am437x-vpfe.h | 2 +- drivers/media/platform/ti/cal/cal.c | 6 +- .../media/platform/ti/davinci/vpif_capture.c | 7 +- drivers/media/platform/ti/omap3isp/isp.c | 4 +- drivers/media/platform/ti/omap3isp/isp.h | 2 +- drivers/media/platform/video-mux.c | 6 +- drivers/media/platform/xilinx/xilinx-vipp.c | 22 +-- drivers/media/v4l2-core/v4l2-async.c | 159 +++++++++--------- drivers/media/v4l2-core/v4l2-fwnode.c | 8 +- .../media/atomisp/pci/atomisp_csi2_bridge.c | 6 +- .../media/deprecated/atmel/atmel-isc-base.c | 4 +- .../media/deprecated/atmel/atmel-isc.h | 2 +- .../deprecated/atmel/atmel-sama5d2-isc.c | 4 +- .../deprecated/atmel/atmel-sama7g5-isc.c | 4 +- drivers/staging/media/imx/imx-media-csi.c | 6 +- .../staging/media/imx/imx-media-dev-common.c | 2 +- drivers/staging/media/imx/imx-media-dev.c | 2 +- drivers/staging/media/imx/imx-media-of.c | 4 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 8 +- .../media/sunxi/sun6i-isp/sun6i_isp_proc.c | 2 +- .../media/sunxi/sun6i-isp/sun6i_isp_proc.h | 2 +- drivers/staging/media/tegra-video/vi.c | 16 +- include/media/davinci/vpif_types.h | 2 +- include/media/v4l2-async.h | 87 +++++----- include/media/v4l2-subdev.h | 4 +- 70 files changed, 368 insertions(+), 361 deletions(-)
Documentation/driver-api/media/v4l2-subdev.rst +29 -22
@@ -206,60 +206,67 @@ of an unregister notifier, it must be cleaned up by calling Before registering the notifier, bridge drivers must do two things: first, the notifier must be initialized using the :c:func:`v4l2_async_nf_init`. Second, -bridge drivers can then begin to form a list of subdevice descriptors that the -bridge device needs for its operation. :c:func:`v4l2_async_nf_add_fwnode`, +bridge drivers can then begin to form a list of async connection descriptors +that the bridge device needs for its +operation. :c:func:`v4l2_async_nf_add_fwnode`, :c:func:`v4l2_async_nf_add_fwnode_remote` and :c:func:`v4l2_async_nf_add_i2c` -are available for that purpose. + +Async connection descriptors describe connections to external sub-devices the +drivers for which are not yet probed. Based on an async connection, a media data +or ancillary link may be created when the related sub-device becomes +available. There may be one or more async connections to a given sub-device but +this is not known at the time of adding the connections to the notifier. Async +connections are bound as matching async sub-devices are found, one by one. Asynchronous sub-device registration helper for camera sensor drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :c:func:`v4l2_async_register_subdev_sensor` is a helper function for sensor -drivers registering their own async sub-device, but it also registers a notifier -and further registers async sub-devices for lens and flash devices found in +drivers registering their own async connection, but it also registers a notifier +and further registers async connections for lens and flash devices found in firmware. The notifier for the sub-device is unregistered and cleaned up with the async sub-device, using :c:func:`v4l2_async_unregister_subdev`. Asynchronous sub-device notifier example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -These functions allocate an async sub-device descriptor which is of type struct -:c:type:`v4l2_async_subdev` embedded in a driver-specific struct. The &struct -:c:type:`v4l2_async_subdev` shall be the first member of this struct: +These functions allocate an async connection descriptor which is of type struct +:c:type:`v4l2_async_connection` embedded in a driver-specific struct. The &struct +:c:type:`v4l2_async_connection` shall be the first member of this struct: .. code-block:: c - struct my_async_subdev { - struct v4l2_async_subdev asd; + struct my_async_connection { + struct v4l2_async_connection asc; ... }; - struct my_async_subdev *my_asd; + struct my_async_connection *my_asc; struct fwnode_handle *ep; ... - my_asd = v4l2_async_nf_add_fwnode_remote(¬ifier, ep, - struct my_async_subdev); + my_asc = v4l2_async_nf_add_fwnode_remote(¬ifier, ep, + struct my_async_connection); fwnode_handle_put(ep); - if (IS_ERR(my_asd)) - return PTR_ERR(my_asd); + if (IS_ERR(my_asc)) + return PTR_ERR(my_asc); Asynchronous sub-device notifier callbacks ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The V4L2 core will then use these descriptors to match asynchronously -registered subdevices to them. If a match is detected the ``.bound()`` -notifier callback is called. After all subdevices have been located the -.complete() callback is called. When a subdevice is removed from the -system the .unbind() method is called. All three callbacks are optional. +The V4L2 core will then use these connection descriptors to match asynchronously +registered subdevices to them. If a match is detected the ``.bound()`` notifier +callback is called. After all connections have been bound the .complete() +callback is called. When a connection is removed from the system the +``.unbind()`` method is called. All three callbacks are optional. Drivers can store any type of custom data in their driver-specific -:c:type:`v4l2_async_subdev` wrapper. If any of that data requires special +:c:type:`v4l2_async_connection` wrapper. If any of that data requires special handling when the structure is freed, drivers must implement the ``.destroy()`` notifier callback. The framework will call it right before freeing the -:c:type:`v4l2_async_subdev`. +:c:type:`v4l2_async_connection`. Calling subdev operations ~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/i2c/ds90ub913.c +3 -3
@@ -518,7 +518,7 @@ static const struct media_entity_operations ub913_entity_ops = {static int ub913_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *source_subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct ub913_data *priv =sd_to_ub913 (notifier->sd);struct device *dev = &priv->client->dev;
@@ -557,7 +557,7 @@ static const struct v4l2_async_notifier_operations ub913_notify_ops = {static int ub913_v4l2_notifier_register (struct ub913_data *priv) {struct device *dev = &priv->client->dev; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep_fwnode;int ret;
@@ -571,7 +571,7 @@ static int ub913_v4l2_notifier_register(struct ub913_data *priv)v4l2_async_nf_init (&priv->notifier); asd =v4l2_async_nf_add_fwnode_remote (&priv->notifier, ep_fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (ep_fwnode);
drivers/media/i2c/ds90ub953.c +3 -3
@@ -723,7 +723,7 @@ static const struct media_entity_operations ub953_entity_ops = {static int ub953_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *source_subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct ub953_data *priv =sd_to_ub953 (notifier->sd);struct device *dev = &priv->client->dev;
@@ -762,7 +762,7 @@ static const struct v4l2_async_notifier_operations ub953_notify_ops = {static int ub953_v4l2_notifier_register (struct ub953_data *priv) {struct device *dev = &priv->client->dev; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep_fwnode;int ret;
@@ -776,7 +776,7 @@ static int ub953_v4l2_notifier_register(struct ub953_data *priv)v4l2_async_nf_init (&priv->notifier); asd =v4l2_async_nf_add_fwnode_remote (&priv->notifier, ep_fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (ep_fwnode);
drivers/media/i2c/ds90ub960.c +4 -4
@@ -471,11 +471,11 @@ struct ub960_rxport { };struct ub960_asd { -struct v4l2_async_subdev base; +struct v4l2_async_connection base;struct ub960_rxport *rxport; }; -static inline struct ub960_asd *to_ub960_asd (struct v4l2_async_subdev *asd) +static inline struct ub960_asd *to_ub960_asd (struct v4l2_async_connection *asd) { return container_of(asd, struct ub960_asd, base); }
@@ -3538,7 +3538,7 @@ static int ub960_parse_dt(struct ub960_data *priv)static int ub960_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct ub960_data *priv =sd_to_ub960 (notifier->sd);struct ub960_rxport *rxport =to_ub960_asd (asd)->rxport;
@@ -3581,7 +3581,7 @@ static int ub960_notify_bound(struct v4l2_async_notifier *notifier,static void ub960_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct ub960_rxport *rxport =to_ub960_asd (asd)->rxport;
drivers/media/i2c/max9286.c +5 -4
@@ -161,11 +161,12 @@ struct max9286_source { };struct max9286_asd { -struct v4l2_async_subdev base; +struct v4l2_async_connection base;struct max9286_source *source; }; -static inline struct max9286_asd *to_max9286_asd (struct v4l2_async_subdev *asd) +static inline struct max9286_asd * +to_max9286_asd (struct v4l2_async_connection *asd) { return container_of(asd, struct max9286_asd, base); }
@@ -659,7 +660,7 @@ static int max9286_set_pixelrate(struct max9286_priv *priv)static int max9286_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct max9286_priv *priv =sd_to_max9286 (notifier->sd);struct max9286_source *source =to_max9286_asd (asd)->source;
@@ -721,7 +722,7 @@ static int max9286_notify_bound(struct v4l2_async_notifier *notifier,static void max9286_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct max9286_priv *priv =sd_to_max9286 (notifier->sd);struct max9286_source *source =to_max9286_asd (asd)->source;
drivers/media/i2c/st-mipid02.c +4 -4
@@ -829,7 +829,7 @@ static const struct media_entity_operations mipid02_subdev_entity_ops = {static int mipid02_async_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *s_subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct mipid02_dev *bridge =to_mipid02_dev (notifier->sd);struct i2c_client *client = bridge->i2c_client;
@@ -863,7 +863,7 @@ static int mipid02_async_bound(struct v4l2_async_notifier *notifier,static void mipid02_async_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *s_subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct mipid02_dev *bridge =to_mipid02_dev (notifier->sd);
@@ -879,7 +879,7 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) {struct v4l2_fwnode_endpoint ep = { .bus_type =V4L2_MBUS_CSI2_DPHY };struct i2c_client *client = bridge->i2c_client; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct device_node *ep_node;int ret;
@@ -914,7 +914,7 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge)v4l2_async_nf_init (&bridge->notifier); asd =v4l2_async_nf_add_fwnode_remote (&bridge->notifier,of_fwnode_handle (ep_node), - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (ep_node);if (IS_ERR (asd)) {
drivers/media/i2c/tc358746.c +3 -3
@@ -1426,7 +1426,7 @@ static int tc358746_init_controls(struct tc358746 *tc358746)static int tc358746_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct tc358746 *tc358746 = container_of(notifier, struct tc358746, notifier);
@@ -1445,7 +1445,7 @@ static int tc358746_async_register(struct tc358746 *tc358746)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_PARALLEL , }; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep;int err;
@@ -1462,7 +1462,7 @@ static int tc358746_async_register(struct tc358746 *tc358746)v4l2_async_nf_init (&tc358746->notifier); asd =v4l2_async_nf_add_fwnode_remote (&tc358746->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (ep);if (IS_ERR (asd)) {
drivers/media/pci/intel/ipu3/ipu3-cio2.c +5 -5
@@ -1372,7 +1372,7 @@ static const struct v4l2_subdev_ops cio2_subdev_ops = {/******* V4L2 sub-device asynchronous registration callbacks***********/ struct sensor_async_subdev { -struct v4l2_async_subdev asd; +struct v4l2_async_connection asd;struct csi2_bus_info csi2; };
@@ -1382,7 +1382,7 @@ struct sensor_async_subdev {/* The .bound() notifier callback when a match is found */ static int cio2_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct cio2_device *cio2 =to_cio2_device (notifier);struct sensor_async_subdev *s_asd =to_sensor_asd (asd);
@@ -1403,7 +1403,7 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,/* The .unbind callback */ static void cio2_notifier_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct cio2_device *cio2 =to_cio2_device (notifier);struct sensor_async_subdev *s_asd =to_sensor_asd (asd);
@@ -1417,11 +1417,11 @@ static int cio2_notifier_complete(struct v4l2_async_notifier *notifier)struct cio2_device *cio2 =to_cio2_device (notifier);struct device *dev = &cio2->pci_dev->dev;struct sensor_async_subdev *s_asd; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct cio2_queue *q;int ret; -list_for_each_entry (asd, &cio2->notifier.asd_list, asd_entry) { +list_for_each_entry (asd, &cio2->notifier.asc_list, asc_entry) { s_asd =to_sensor_asd (asd); q = &cio2->queue[s_asd->csi2.port];
drivers/media/platform/atmel/atmel-isi.c +4 -4
@@ -1120,7 +1120,7 @@ static int isi_graph_notify_complete(struct v4l2_async_notifier *notifier)static void isi_graph_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct atmel_isi *isi =notifier_to_isi (notifier);
@@ -1132,7 +1132,7 @@ static void isi_graph_notify_unbind(struct v4l2_async_notifier *notifier,static int isi_graph_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct atmel_isi *isi =notifier_to_isi (notifier);
@@ -1151,7 +1151,7 @@ static const struct v4l2_async_notifier_operations isi_graph_notify_ops = {static int isi_graph_init (struct atmel_isi *isi) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct device_node *ep;int ret;
@@ -1163,7 +1163,7 @@ static int isi_graph_init(struct atmel_isi *isi) asd =v4l2_async_nf_add_fwnode_remote (&isi->notifier,of_fwnode_handle (ep), - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (ep);if (IS_ERR (asd))
drivers/media/platform/cadence/cdns-csi2rx.c +3 -3
@@ -313,7 +313,7 @@ static const struct v4l2_subdev_ops csi2rx_subdev_ops = {static int csi2rx_async_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *s_subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct v4l2_subdev *subdev = notifier->sd;struct csi2rx_priv *csi2rx =v4l2_subdev_to_csi2rx (subdev);
@@ -440,7 +440,7 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,static int csi2rx_parse_dt (struct csi2rx_priv *csi2rx) {struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type =0 }; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *fwh;struct device_node *ep;int ret;
@@ -477,7 +477,7 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)v4l2_async_nf_init (&csi2rx->notifier); asd =v4l2_async_nf_add_fwnode_remote (&csi2rx->notifier, fwh, - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (ep);if (IS_ERR (asd))return PTR_ERR (asd);
drivers/media/platform/intel/pxa_camera.c +6 -6
@@ -2044,7 +2044,7 @@ static const struct video_device pxa_camera_videodev_template = {static int pxa_camera_sensor_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {int err;struct v4l2_device *v4l2_dev = notifier->v4l2_dev;
@@ -2123,7 +2123,7 @@ static int pxa_camera_sensor_bound(struct v4l2_async_notifier *notifier,static void pxa_camera_sensor_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct pxa_camera_dev *pcdev =v4l2_dev_to_pcdev (notifier->v4l2_dev);
@@ -2197,7 +2197,7 @@ static int pxa_camera_pdata_from_dt(struct device *dev, struct pxa_camera_dev *pcdev) {u32 mclk_rate; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct device_node *np = dev->of_node;struct v4l2_fwnode_endpoint ep = { .bus_type =0 }; int err = of_property_read_u32(np, "clock-frequency",
@@ -2252,7 +2252,7 @@ static int pxa_camera_pdata_from_dt(struct device *dev, asd =v4l2_async_nf_add_fwnode_remote (&pcdev->notifier,of_fwnode_handle (np), - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (asd)) err =PTR_ERR (asd); out:
@@ -2299,14 +2299,14 @@ static int pxa_camera_probe(struct platform_device *pdev) pcdev->res = res; pcdev->pdata = pdev->dev.platform_data;if (pcdev->pdata) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd; pcdev->platform_flags = pcdev->pdata->flags; pcdev->mclk = pcdev->pdata->mclk_10khz *10000 ; asd =v4l2_async_nf_add_i2c (&pcdev->notifier, pcdev->pdata->sensor_i2c_adapter_id, pcdev->pdata->sensor_i2c_address, - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (asd)) err =PTR_ERR (asd); }else if (pdev->dev.of_node) {
drivers/media/platform/marvell/cafe-driver.c +3 -2
@@ -478,7 +478,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,int ret;struct cafe_camera *cam;struct mcam_camera *mcam; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct i2c_client *i2c_dev;/*
@@ -540,7 +540,8 @@ static int cafe_pci_probe(struct pci_dev *pdev, asd =v4l2_async_nf_add_i2c (&mcam->notifier,i2c_adapter_id (cam->i2c_adapter), - ov7670_info.addr, struct v4l2_async_subdev); + ov7670_info.addr, + struct v4l2_async_connection);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out_smbus_shutdown;
drivers/media/platform/marvell/mcam-core.c +2 -2
@@ -1756,7 +1756,7 @@ EXPORT_SYMBOL_GPL(mccic_irq);*/ static int mccic_notify_bound (struct v4l2_async_notifier *notifier, -struct v4l2_subdev *subdev,struct v4l2_async_subdev *asd) +struct v4l2_subdev *subdev,struct v4l2_async_connection *asd) {struct mcam_camera *cam =notifier_to_mcam (notifier);int ret;
@@ -1801,7 +1801,7 @@ static int mccic_notify_bound(struct v4l2_async_notifier *notifier, }static void mccic_notify_unbind (struct v4l2_async_notifier *notifier, -struct v4l2_subdev *subdev,struct v4l2_async_subdev *asd) +struct v4l2_subdev *subdev,struct v4l2_async_connection *asd) {struct mcam_camera *cam =notifier_to_mcam (notifier);
drivers/media/platform/marvell/mmp-driver.c +2 -2
@@ -180,7 +180,7 @@ static int mmpcam_probe(struct platform_device *pdev)struct resource *res;struct fwnode_handle *ep;struct mmp_camera_platform_data *pdata; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;int ret; cam =devm_kzalloc (&pdev->dev,sizeof (*cam),GFP_KERNEL );
@@ -241,7 +241,7 @@ static int mmpcam_probe(struct platform_device *pdev)v4l2_async_nf_init (&mcam->notifier); asd =v4l2_async_nf_add_fwnode_remote (&mcam->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (ep);if (IS_ERR (asd)) { ret =PTR_ERR (asd);
drivers/media/platform/microchip/microchip-csi2dc.c +3 -3
@@ -476,7 +476,7 @@ static const struct v4l2_subdev_ops csi2dc_subdev_ops = {static int csi2dc_async_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct csi2dc_device *csi2dc =container_of (notifier, struct csi2dc_device, notifier);
@@ -520,14 +520,14 @@ static const struct v4l2_async_notifier_operations csi2dc_async_ops = {static int csi2dc_prepare_notifier (struct csi2dc_device *csi2dc,struct fwnode_handle *input_fwnode) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;int ret =0 ;v4l2_async_nf_init (&csi2dc->notifier); asd =v4l2_async_nf_add_fwnode_remote (&csi2dc->notifier, input_fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (input_fwnode);
drivers/media/platform/microchip/microchip-isc-base.c +2 -2
@@ -1712,7 +1712,7 @@ static int isc_ctrl_init(struct isc_device *isc)static int isc_async_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct isc_device *isc =container_of (notifier->v4l2_dev, struct isc_device, v4l2_dev);
@@ -1741,7 +1741,7 @@ static int isc_async_bound(struct v4l2_async_notifier *notifier,static void isc_async_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct isc_device *isc =container_of (notifier->v4l2_dev, struct isc_device, v4l2_dev);
drivers/media/platform/microchip/microchip-isc.h +1 -1
@@ -44,7 +44,7 @@ struct isc_buffer {struct isc_subdev_entity {struct v4l2_subdev *sd; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct device_node *epn;struct v4l2_async_notifier notifier;
drivers/media/platform/microchip/microchip-sama5d2-isc.c +2 -2
@@ -523,7 +523,7 @@ static int microchip_isc_probe(struct platform_device *pdev) }list_for_each_entry (subdev_entity, &isc->subdev_entities, list) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *fwnode =of_fwnode_handle (subdev_entity->epn);
@@ -531,7 +531,7 @@ static int microchip_isc_probe(struct platform_device *pdev) asd =v4l2_async_nf_add_fwnode_remote (&subdev_entity->notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (subdev_entity->epn); subdev_entity->epn =NULL ;
drivers/media/platform/microchip/microchip-sama7g5-isc.c +2 -2
@@ -513,7 +513,7 @@ static int microchip_xisc_probe(struct platform_device *pdev) }list_for_each_entry (subdev_entity, &isc->subdev_entities, list) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *fwnode =of_fwnode_handle (subdev_entity->epn);
@@ -521,7 +521,7 @@ static int microchip_xisc_probe(struct platform_device *pdev) asd =v4l2_async_nf_add_fwnode_remote (&subdev_entity->notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (subdev_entity->epn); subdev_entity->epn =NULL ;
drivers/media/platform/nxp/imx-mipi-csis.c +3 -3
@@ -1229,7 +1229,7 @@ mipi_notifier_to_csis_state(struct v4l2_async_notifier *n)static int mipi_csis_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct mipi_csis_device *csis =mipi_notifier_to_csis_state (notifier);struct media_pad *sink = &csis->sd.entity.pads[CSIS_PAD_SINK ];
@@ -1246,7 +1246,7 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_CSI2_DPHY , }; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep;unsigned int i;int ret;
@@ -1277,7 +1277,7 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis)dev_dbg (csis->dev,"flags: 0x%08x\n" , csis->bus.flags); asd =v4l2_async_nf_add_fwnode_remote (&csis->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto err_parse;
drivers/media/platform/nxp/imx7-media-csi.c +3 -3
@@ -2032,7 +2032,7 @@ static const struct media_entity_operations imx7_csi_entity_ops = {static int imx7_csi_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct imx7_csi *csi =imx7_csi_notifier_to_dev (notifier);struct media_pad *sink = &csi->sd.entity.pads[IMX7_CSI_PAD_SINK ];
@@ -2057,7 +2057,7 @@ static const struct v4l2_async_notifier_operations imx7_csi_notify_ops = {static int imx7_csi_async_register (struct imx7_csi *csi) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep;int ret;
@@ -2072,7 +2072,7 @@ static int imx7_csi_async_register(struct imx7_csi *csi) } asd =v4l2_async_nf_add_fwnode_remote (&csi->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (ep);
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +4 -4
@@ -30,12 +30,12 @@*/ struct mxc_isi_async_subdev { -struct v4l2_async_subdev asd; +struct v4l2_async_connection asd;unsigned int port; };static inline struct mxc_isi_async_subdev * -asd_to_mxc_isi_async_subdev (struct v4l2_async_subdev *asd) +asd_to_mxc_isi_async_subdev (struct v4l2_async_connection *asd) { return container_of(asd, struct mxc_isi_async_subdev, asd); };
@@ -48,12 +48,12 @@ notifier_to_mxc_isi_dev(struct v4l2_async_notifier *n)static int mxc_isi_async_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asc) {const unsigned int link_flags =MEDIA_LNK_FL_IMMUTABLE |MEDIA_LNK_FL_ENABLED ;struct mxc_isi_dev *isi =notifier_to_mxc_isi_dev (notifier); -struct mxc_isi_async_subdev *masd =asd_to_mxc_isi_async_subdev (asd); +struct mxc_isi_async_subdev *masd =asd_to_mxc_isi_async_subdev (asc);struct media_pad *pad = &isi->crossbar.pads[masd->port];struct device_link *link;
drivers/media/platform/nxp/imx8mq-mipi-csi2.c +3 -3
@@ -567,7 +567,7 @@ mipi_notifier_to_csi2_state(struct v4l2_async_notifier *n)static int imx8mq_mipi_csi_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct csi_state *state =mipi_notifier_to_csi2_state (notifier);struct media_pad *sink = &state->sd.entity.pads[MIPI_CSI2_PAD_SINK ];
@@ -587,7 +587,7 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_CSI2_DPHY , }; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep;unsigned int i;int ret;
@@ -619,7 +619,7 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) state->bus.flags); asd =v4l2_async_nf_add_fwnode_remote (&state->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto err_parse;
drivers/media/platform/qcom/camss/camss.c +1 -1
@@ -1383,7 +1383,7 @@ static void camss_unregister_entities(struct camss *camss)static int camss_subdev_notifier_bound (struct v4l2_async_notifier *async,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) { struct camss *camss = container_of(async, struct camss, notifier); struct camss_async_subdev *csd =
drivers/media/platform/qcom/camss/camss.h +1 -1
@@ -113,7 +113,7 @@ struct camss_camera_interface { };struct camss_async_subdev { -struct v4l2_async_subdev asd;/* must be first */ +struct v4l2_async_connection asd;/* must be first */ struct camss_camera_interface interface; };
drivers/media/platform/renesas/rcar-isp.c +4 -4
@@ -326,7 +326,7 @@ static const struct v4l2_subdev_ops rcar_isp_subdev_ops = {static int risp_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct rcar_isp *isp =notifier_to_isp (notifier);int pad;
@@ -350,7 +350,7 @@ static int risp_notify_bound(struct v4l2_async_notifier *notifier,static void risp_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct rcar_isp *isp =notifier_to_isp (notifier);
@@ -366,7 +366,7 @@ static const struct v4l2_async_notifier_operations risp_notify_ops = {static int risp_parse_dt (struct rcar_isp *isp) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *fwnode;struct fwnode_handle *ep;unsigned int id;
@@ -396,7 +396,7 @@ static int risp_parse_dt(struct rcar_isp *isp) isp->notifier.ops = &risp_notify_ops; asd =v4l2_async_nf_add_fwnode (&isp->notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (fwnode);if (IS_ERR (asd))return PTR_ERR (asd);
drivers/media/platform/renesas/rcar-vin/rcar-core.c +22 -22
131 lines not on this page · raw message
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +8 -8
@@ -988,12 +988,12 @@ static irqreturn_t rcsi2_irq_thread(int irq, void *data)static int rcsi2_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asc) {struct rcar_csi2 *priv =notifier_to_csi2 (notifier);int pad; - pad =media_entity_get_fwnode_pad (&subdev->entity, asd->match.fwnode, + pad =media_entity_get_fwnode_pad (&subdev->entity, asc->match.fwnode,MEDIA_PAD_FL_SOURCE );if (pad <0 ) {dev_err (priv->dev,"Failed to find pad for %s\n" , subdev->name);
@@ -1013,7 +1013,7 @@ static int rcsi2_notify_bound(struct v4l2_async_notifier *notifier,static void rcsi2_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asc) {struct rcar_csi2 *priv =notifier_to_csi2 (notifier);
@@ -1090,7 +1090,7 @@ static int rcsi2_parse_v4l2(struct rcar_csi2 *priv,static int rcsi2_parse_dt (struct rcar_csi2 *priv) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asc;struct fwnode_handle *fwnode;struct fwnode_handle *ep;struct v4l2_fwnode_endpoint v4l2_ep = {
@@ -1125,11 +1125,11 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)v4l2_async_nf_init (&priv->notifier); priv->notifier.ops = &rcar_csi2_notify_ops; - asd =v4l2_async_nf_add_fwnode (&priv->notifier, fwnode, - struct v4l2_async_subdev); + asc =v4l2_async_nf_add_fwnode (&priv->notifier, fwnode, + struct v4l2_async_connection);fwnode_handle_put (fwnode); -if (IS_ERR (asd)) -return PTR_ERR (asd); +if (IS_ERR (asc)) +return PTR_ERR (asc); ret =v4l2_async_subdev_nf_register (&priv->subdev, &priv->notifier);if (ret)
drivers/media/platform/renesas/rcar-vin/rcar-vin.h +5 -5
@@ -106,7 +106,7 @@ struct rvin_video_format {/** * struct rvin_parallel_entity - Parallel video input endpoint descriptor -* @asd: sub-device descriptor for async framework +* @asc: async connection descriptor for async framework * @subdev: subdevice matched using async framework * @mbus_type: media bus type * @bus: media bus parallel configuration
@@ -115,7 +115,7 @@ struct rvin_video_format {* */ struct rvin_parallel_entity { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asc;struct v4l2_subdev *subdev;enum v4l2_mbus_type mbus_type;
@@ -272,10 +272,10 @@ struct rvin_dev {* * @lock: protects the count, notifier, vin and csi members * @count: number of enabled VIN instances found in DT -* @notifier: group notifier for CSI-2 async subdevices +* @notifier: group notifier for CSI-2 async connections * @vin: VIN instances which are part of the group * @link_setup: Callback to create all links for the media graph -* @remotes: array of pairs of fwnode and subdev pointers +* @remotes: array of pairs of async connection and subdev pointers * to all remote subdevices. */ struct rvin_group {
@@ -291,7 +291,7 @@ struct rvin_group {int (*link_setup)(struct rvin_dev *vin);struct { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asc;struct v4l2_subdev *subdev; } remotes[RVIN_REMOTES_MAX ]; };
drivers/media/platform/renesas/rcar_drif.c +4 -4
@@ -1098,7 +1098,7 @@ static void rcar_drif_sdr_unregister(struct rcar_drif_sdr *sdr)/* Sub-device bound callback */ static int rcar_drif_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct rcar_drif_sdr *sdr = container_of(notifier, struct rcar_drif_sdr, notifier);
@@ -1113,7 +1113,7 @@ static int rcar_drif_notify_bound(struct v4l2_async_notifier *notifier,/* Sub-device unbind callback */ static void rcar_drif_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct rcar_drif_sdr *sdr = container_of(notifier, struct rcar_drif_sdr, notifier);
@@ -1206,7 +1206,7 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr) {struct v4l2_async_notifier *notifier = &sdr->notifier;struct fwnode_handle *fwnode, *ep; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;v4l2_async_nf_init (notifier);
@@ -1226,7 +1226,7 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr) } asd =v4l2_async_nf_add_fwnode (notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (fwnode);if (IS_ERR (asd))return PTR_ERR (asd);
drivers/media/platform/renesas/renesas-ceu.c +3 -3
@@ -151,7 +151,7 @@ static inline struct ceu_buffer *vb2_to_ceu(struct vb2_v4l2_buffer *vbuf)* ceu_subdev - Wraps v4l2 sub-device and provides async subdevice. */ struct ceu_subdev { -struct v4l2_async_subdev asd; +struct v4l2_async_connection asd;struct v4l2_subdev *v4l2_sd;/* per-subdevice mbus configuration options */
@@ -159,7 +159,7 @@ struct ceu_subdev {struct ceu_mbus_fmt mbus_fmt; }; -static struct ceu_subdev *to_ceu_subdev (struct v4l2_async_subdev *asd) +static struct ceu_subdev *to_ceu_subdev (struct v4l2_async_connection *asd) { return container_of(asd, struct ceu_subdev, asd); }
@@ -1374,7 +1374,7 @@ static void ceu_vdev_release(struct video_device *vdev)static int ceu_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *v4l2_sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct v4l2_device *v4l2_dev = notifier->v4l2_dev;struct ceu_device *ceudev =v4l2_to_ceu (v4l2_dev);
drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +5 -5
@@ -92,7 +92,7 @@ static int rzg2l_cru_group_notify_complete(struct v4l2_async_notifier *notifier)static void rzg2l_cru_group_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct rzg2l_cru_dev *cru =notifier_to_cru (notifier);
@@ -110,7 +110,7 @@ static void rzg2l_cru_group_notify_unbind(struct v4l2_async_notifier *notifier,static int rzg2l_cru_group_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct rzg2l_cru_dev *cru =notifier_to_cru (notifier);
@@ -138,7 +138,7 @@ static int rzg2l_cru_mc_parse_of(struct rzg2l_cru_dev *cru) .bus_type = V4L2_MBUS_CSI2_DPHY, };struct fwnode_handle *ep, *fwnode; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;int ret; ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (cru->dev),1 ,0 ,0 );
@@ -162,7 +162,7 @@ static int rzg2l_cru_mc_parse_of(struct rzg2l_cru_dev *cru) } asd =v4l2_async_nf_add_fwnode (&cru->notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out;
@@ -190,7 +190,7 @@ static int rzg2l_cru_mc_parse_of_graph(struct rzg2l_cru_dev *cru) cru->notifier.ops = &rzg2l_cru_async_ops; -if (list_empty (&cru->notifier.asd_list)) +if (list_empty (&cru->notifier.asc_list))return 0 ; ret =v4l2_async_nf_register (&cru->v4l2_dev, &cru->notifier);
drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h +1 -1
@@ -45,7 +45,7 @@ enum rzg2l_cru_dma_state { };struct rzg2l_cru_csi { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct v4l2_subdev *subdev;u32 channel; };
drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c +4 -4
@@ -599,7 +599,7 @@ static const struct v4l2_subdev_ops rzg2l_csi2_subdev_ops = {static int rzg2l_csi2_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct rzg2l_csi2 *csi2 =notifier_to_csi2 (notifier);
@@ -615,7 +615,7 @@ static int rzg2l_csi2_notify_bound(struct v4l2_async_notifier *notifier,static void rzg2l_csi2_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct rzg2l_csi2 *csi2 =notifier_to_csi2 (notifier);
@@ -646,7 +646,7 @@ static int rzg2l_csi2_parse_dt(struct rzg2l_csi2 *csi2)struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type =V4L2_MBUS_CSI2_DPHY }; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *fwnode;struct fwnode_handle *ep;int ret;
@@ -677,7 +677,7 @@ static int rzg2l_csi2_parse_dt(struct rzg2l_csi2 *csi2) csi2->notifier.ops = &rzg2l_csi2_notify_ops; asd =v4l2_async_nf_add_fwnode (&csi2->notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (fwnode);if (IS_ERR (asd))return PTR_ERR (asd);
drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +1 -1
@@ -148,7 +148,7 @@ struct rkisp1_info {* @port: port number (0: MIPI, 1: Parallel) */ struct rkisp1_sensor_async { -struct v4l2_async_subdev asd; +struct v4l2_async_connection asd;unsigned int index;struct fwnode_handle *source_ep;unsigned int lanes;
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +4 -4
@@ -122,12 +122,12 @@ struct rkisp1_isr_data {static int rkisp1_subdev_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asc) {struct rkisp1_device *rkisp1 = container_of(notifier, struct rkisp1_device, notifier);struct rkisp1_sensor_async *s_asd = - container_of(asd, struct rkisp1_sensor_async, asd); + container_of(asc, struct rkisp1_sensor_async, asd);int source_pad;int ret;
@@ -165,10 +165,10 @@ static int rkisp1_subdev_notifier_complete(struct v4l2_async_notifier *notifier)return v4l2_device_register_subdev_nodes (&rkisp1->v4l2_dev); } -static void rkisp1_subdev_notifier_destroy (struct v4l2_async_subdev *asd) +static void rkisp1_subdev_notifier_destroy (struct v4l2_async_connection *asc) {struct rkisp1_sensor_async *rk_asd = - container_of(asd, struct rkisp1_sensor_async, asd); + container_of(asc, struct rkisp1_sensor_async, asd);fwnode_handle_put (rk_asd->source_ep); }
drivers/media/platform/samsung/exynos4-is/media-dev.c +3 -3
@@ -400,7 +400,7 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd,int index = fmd->num_sensors;struct fimc_source_info *pd = &fmd->sensor[index].pdata;struct device_node *rem, *np; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct v4l2_fwnode_endpoint endpoint = { .bus_type =0 };int ret;
@@ -465,7 +465,7 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd, asd =v4l2_async_nf_add_fwnode_remote (&fmd->subdev_notifier,of_fwnode_handle (ep), - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (ep);
@@ -1371,7 +1371,7 @@ static int fimc_md_register_clk_provider(struct fimc_md *fmd)static int subdev_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct fimc_md *fmd =notifier_to_fimc_md (notifier);struct fimc_sensor_info *si =NULL ;
drivers/media/platform/samsung/exynos4-is/media-dev.h +1 -1
@@ -82,7 +82,7 @@ struct fimc_camclk_info {*/ struct fimc_sensor_info {struct fimc_source_info pdata; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct v4l2_subdev *subdev;struct fimc_dev *host; };
drivers/media/platform/st/stm32/stm32-dcmi.c +4 -4
@@ -1837,7 +1837,7 @@ static int dcmi_graph_notify_complete(struct v4l2_async_notifier *notifier)static void dcmi_graph_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct stm32_dcmi *dcmi =notifier_to_dcmi (notifier);
@@ -1849,7 +1849,7 @@ static void dcmi_graph_notify_unbind(struct v4l2_async_notifier *notifier,static int dcmi_graph_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct stm32_dcmi *dcmi =notifier_to_dcmi (notifier);unsigned int ret;
@@ -1887,7 +1887,7 @@ static const struct v4l2_async_notifier_operations dcmi_graph_notify_ops = {static int dcmi_graph_init (struct stm32_dcmi *dcmi) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct device_node *ep;int ret;
@@ -1901,7 +1901,7 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi) asd =v4l2_async_nf_add_fwnode_remote (&dcmi->notifier,of_fwnode_handle (ep), - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (ep);
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +3 -3
@@ -41,7 +41,7 @@ static const struct media_entity_operations sun4i_csi_video_entity_ops = {static int sun4i_csi_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) { struct sun4i_csi *csi = container_of(notifier, struct sun4i_csi, notifier);
@@ -117,7 +117,7 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_PARALLEL , }; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep;int ret;
@@ -135,7 +135,7 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi) csi->bus = vep.bus.parallel; asd =v4l2_async_nf_add_fwnode_remote (&csi->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +1 -1
@@ -642,7 +642,7 @@ static int sun6i_csi_bridge_link(struct sun6i_csi_device *csi_dev,static int sun6i_csi_bridge_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *remote_subdev, -struct v4l2_async_subdev *async_subdev) +struct v4l2_async_connection *async_subdev) {struct sun6i_csi_device *csi_dev = container_of(notifier, struct sun6i_csi_device,
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h +1 -1
@@ -34,7 +34,7 @@ struct sun6i_csi_bridge_source { };struct sun6i_csi_bridge_async_subdev { -struct v4l2_async_subdev async_subdev; +struct v4l2_async_connection async_subdev;struct sun6i_csi_bridge_source *source; };
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c +3 -3
@@ -407,7 +407,7 @@ static const struct media_entity_operations sun6i_mipi_csi2_entity_ops = {static int sun6i_mipi_csi2_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *remote_subdev, -struct v4l2_async_subdev *async_subdev) +struct v4l2_async_connection *async_subdev) {struct v4l2_subdev *subdev = notifier->sd; struct sun6i_mipi_csi2_device *csi2_dev =
@@ -461,7 +461,7 @@ sun6i_mipi_csi2_bridge_source_setup(struct sun6i_mipi_csi2_device *csi2_dev) {struct v4l2_async_notifier *notifier = &csi2_dev->bridge.notifier;struct v4l2_fwnode_endpoint *endpoint = &csi2_dev->bridge.endpoint; -struct v4l2_async_subdev *subdev_async; +struct v4l2_async_connection *subdev_async;struct fwnode_handle *handle;struct device *dev = csi2_dev->dev;int ret;
@@ -479,7 +479,7 @@ sun6i_mipi_csi2_bridge_source_setup(struct sun6i_mipi_csi2_device *csi2_dev) subdev_async =v4l2_async_nf_add_fwnode_remote (notifier, handle, - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (subdev_async)) ret =PTR_ERR (subdev_async);
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +3 -3
@@ -444,7 +444,7 @@ static const struct media_entity_operations sun8i_a83t_mipi_csi2_entity_ops = {static int sun8i_a83t_mipi_csi2_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *remote_subdev, -struct v4l2_async_subdev *async_subdev) +struct v4l2_async_connection *async_subdev) {struct v4l2_subdev *subdev = notifier->sd; struct sun8i_a83t_mipi_csi2_device *csi2_dev =
@@ -498,7 +498,7 @@ sun8i_a83t_mipi_csi2_bridge_source_setup(struct sun8i_a83t_mipi_csi2_device *csi {struct v4l2_async_notifier *notifier = &csi2_dev->bridge.notifier;struct v4l2_fwnode_endpoint *endpoint = &csi2_dev->bridge.endpoint; -struct v4l2_async_subdev *subdev_async; +struct v4l2_async_connection *subdev_async;struct fwnode_handle *handle;struct device *dev = csi2_dev->dev;int ret;
@@ -516,7 +516,7 @@ sun8i_a83t_mipi_csi2_bridge_source_setup(struct sun8i_a83t_mipi_csi2_device *csi subdev_async =v4l2_async_nf_add_fwnode_remote (notifier, handle, - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (subdev_async)) ret =PTR_ERR (subdev_async);
drivers/media/platform/ti/am437x/am437x-vpfe.c +2 -3
@@ -2144,7 +2144,7 @@ static const struct v4l2_ioctl_ops vpfe_ioctl_ops = {static int vpfe_async_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct vpfe_device *vpfe =container_of (notifier->v4l2_dev, struct vpfe_device, v4l2_dev);
@@ -2370,8 +2370,7 @@ vpfe_get_pdata(struct vpfe_device *vpfe) pdata->asd[i] =v4l2_async_nf_add_fwnode (&vpfe->notifier,of_fwnode_handle (rem), - struct - v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (rem);if (IS_ERR (pdata->asd[i])) goto cleanup;
drivers/media/platform/ti/am437x/am437x-vpfe.h +1 -1
@@ -84,7 +84,7 @@ struct vpfe_config {/* information about each subdev */ struct vpfe_subdev_info sub_devs[VPFE_MAX_SUBDEV ];/* Flat array, arranged in groups */ -struct v4l2_async_subdev *asd[VPFE_MAX_SUBDEV ]; +struct v4l2_async_connection *asd[VPFE_MAX_SUBDEV ]; };struct vpfe_cap_buffer {
drivers/media/platform/ti/cal/cal.c +3 -3
@@ -774,19 +774,19 @@ static irqreturn_t cal_irq(int irq_cal, void *data)*/ struct cal_v4l2_async_subdev { -struct v4l2_async_subdev asd;/* Must be first */ +struct v4l2_async_connection asd;/* Must be first */ struct cal_camerarx *phy; };static inline struct cal_v4l2_async_subdev * -to_cal_asd (struct v4l2_async_subdev *asd) +to_cal_asd (struct v4l2_async_connection *asd) { return container_of(asd, struct cal_v4l2_async_subdev, asd); }static int cal_async_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct cal_camerarx *phy =to_cal_asd (asd)->phy;int pad;
drivers/media/platform/ti/davinci/vpif_capture.c +3 -4
@@ -1363,12 +1363,12 @@ static inline void free_vpif_objs(void)static int vpif_async_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {int i;for (i =0 ; i < vpif_obj.config->asd_sizes[0 ]; i++) { -struct v4l2_async_subdev *_asd = vpif_obj.config->asd[i]; +struct v4l2_async_connection *_asd = vpif_obj.config->asd[i];const struct fwnode_handle *fwnode = _asd->match.fwnode;if (fwnode == subdev->fwnode) {
@@ -1570,8 +1570,7 @@ vpif_capture_get_pdata(struct platform_device *pdev) pdata->asd[i] =v4l2_async_nf_add_fwnode (&vpif_obj.notifier,of_fwnode_handle (rem), - struct - v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (pdata->asd[i])) goto err_cleanup;
drivers/media/platform/ti/omap3isp/isp.c +2 -2
@@ -2024,12 +2024,12 @@ enum isp_of_phy {static int isp_subdev_notifier_bound (struct v4l2_async_notifier *async,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asc) { struct isp_device *isp = container_of(async, struct isp_device, notifier);struct isp_bus_cfg *bus_cfg = - &container_of(asd, struct isp_async_subdev, asd)->bus; + &container_of(asc, struct isp_async_subdev, asd)->bus;int ret;mutex_lock (&isp->media_dev.graph_mutex);
drivers/media/platform/ti/omap3isp/isp.h +1 -1
@@ -220,7 +220,7 @@ struct isp_device { };struct isp_async_subdev { -struct v4l2_async_subdev asd; +struct v4l2_async_connection asd;struct isp_bus_cfg bus; };
drivers/media/platform/video-mux.c +3 -3
@@ -314,7 +314,7 @@ static const struct v4l2_subdev_ops video_mux_subdev_ops = {static int video_mux_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct video_mux *vmux =notifier_to_video_mux (notifier);
@@ -334,7 +334,7 @@ static int video_mux_async_register(struct video_mux *vmux,v4l2_async_nf_init (&vmux->notifier);for (i =0 ; i < num_input_pads; i++) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep, *remote_ep; ep = fwnode_graph_get_endpoint_by_id(
@@ -352,7 +352,7 @@ static int video_mux_async_register(struct video_mux *vmux,fwnode_handle_put (remote_ep); asd =v4l2_async_nf_add_fwnode_remote (&vmux->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (ep);
drivers/media/platform/xilinx/xilinx-vipp.c +11 -11
@@ -34,13 +34,13 @@* @subdev: V4L2 subdev */ struct xvip_graph_entity { -struct v4l2_async_subdev asd;/* must be first */ +struct v4l2_async_connection asd;/* must be first */ struct media_entity *entity;struct v4l2_subdev *subdev; };static inline struct xvip_graph_entity * -to_xvip_entity (struct v4l2_async_subdev *asd) +to_xvip_entity (struct v4l2_async_connection *asd) { return container_of(asd, struct xvip_graph_entity, asd); }
@@ -54,9 +54,9 @@ xvip_graph_find_entity(struct xvip_composite_device *xdev, const struct fwnode_handle *fwnode) {struct xvip_graph_entity *entity; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd; -list_for_each_entry (asd, &xdev->notifier.asd_list, asd_entry) { +list_for_each_entry (asd, &xdev->notifier.asc_list, asc_entry) { entity =to_xvip_entity (asd);if (entity->asd.match.fwnode == fwnode)return entity;
@@ -285,13 +285,13 @@ static int xvip_graph_notify_complete(struct v4l2_async_notifier *notifier)struct xvip_composite_device *xdev = container_of(notifier, struct xvip_composite_device, notifier);struct xvip_graph_entity *entity; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;int ret;dev_dbg (xdev->dev,"notify complete, all subdevs registered\n" );/* Create links for every entity. */ -list_for_each_entry (asd, &xdev->notifier.asd_list, asd_entry) { +list_for_each_entry (asd, &xdev->notifier.asc_list, asc_entry) { entity =to_xvip_entity (asd); ret =xvip_graph_build_one (xdev, entity);if (ret <0 )
@@ -312,9 +312,9 @@ static int xvip_graph_notify_complete(struct v4l2_async_notifier *notifier)static int xvip_graph_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asc) { -struct xvip_graph_entity *entity =to_xvip_entity (asd); +struct xvip_graph_entity *entity =to_xvip_entity (asc); entity->entity = &subdev->entity; entity->subdev = subdev;
@@ -380,7 +380,7 @@ static int xvip_graph_parse_one(struct xvip_composite_device *xdev,static int xvip_graph_parse (struct xvip_composite_device *xdev) {struct xvip_graph_entity *entity; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;int ret;/*
@@ -393,7 +393,7 @@ static int xvip_graph_parse(struct xvip_composite_device *xdev)if (ret <0 )return 0 ; -list_for_each_entry (asd, &xdev->notifier.asd_list, asd_entry) { +list_for_each_entry (asd, &xdev->notifier.asc_list, asc_entry) { entity =to_xvip_entity (asd); ret =xvip_graph_parse_one (xdev, entity->asd.match.fwnode);if (ret <0 ) {
@@ -501,7 +501,7 @@ static int xvip_graph_init(struct xvip_composite_device *xdev) goto done; } -if (list_empty (&xdev->notifier.asd_list)) { +if (list_empty (&xdev->notifier.asc_list)) {dev_err (xdev->dev,"no subdev found in graph\n" ); ret = -ENOENT ; goto done;
drivers/media/v4l2-core/v4l2-async.c +79 -80
386 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-fwnode.c +4 -4
@@ -831,10 +831,10 @@ static int v4l2_fwnode_reference_parse(struct device *dev, !(ret =fwnode_property_get_reference_args (dev_fwnode (dev), prop,NULL ,0 , index, &args)); index++) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd; asd =v4l2_async_nf_add_fwnode (notifier, args.fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (args.fwnode);if (IS_ERR (asd)) {/* not an error if asd already exists */
@@ -1136,10 +1136,10 @@ v4l2_fwnode_reference_parse_int_props(struct device *dev, props, nprops))); index++) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd; asd =v4l2_async_nf_add_fwnode (notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (fwnode);if (IS_ERR (asd)) { ret =PTR_ERR (asd);
drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c +3 -3
@@ -767,7 +767,7 @@ int atomisp_csi2_bridge_init(struct atomisp_device *isp)/******* V4L2 sub-device asynchronous registration callbacks***********/ struct sensor_async_subdev { -struct v4l2_async_subdev asd; +struct v4l2_async_connection asd;int port; };
@@ -777,7 +777,7 @@ struct sensor_async_subdev {/* .bound() notifier callback when a match is found */ static int atomisp_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct atomisp_device *isp =notifier_to_atomisp (notifier);struct sensor_async_subdev *s_asd =to_sensor_asd (asd);
@@ -799,7 +799,7 @@ static int atomisp_notifier_bound(struct v4l2_async_notifier *notifier,/* The .unbind callback */ static void atomisp_notifier_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct atomisp_device *isp =notifier_to_atomisp (notifier);struct sensor_async_subdev *s_asd =to_sensor_asd (asd);
drivers/staging/media/deprecated/atmel/atmel-isc-base.c +2 -2
@@ -1727,7 +1727,7 @@ static int isc_ctrl_init(struct isc_device *isc)static int isc_async_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct isc_device *isc =container_of (notifier->v4l2_dev, struct isc_device, v4l2_dev);
@@ -1746,7 +1746,7 @@ static int isc_async_bound(struct v4l2_async_notifier *notifier,static void isc_async_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct isc_device *isc =container_of (notifier->v4l2_dev, struct isc_device, v4l2_dev);
drivers/staging/media/deprecated/atmel/atmel-isc.h +1 -1
@@ -44,7 +44,7 @@ struct isc_buffer {struct isc_subdev_entity {struct v4l2_subdev *sd; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct device_node *epn;struct v4l2_async_notifier notifier;
drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c +2 -2
@@ -503,7 +503,7 @@ static int atmel_isc_probe(struct platform_device *pdev) }list_for_each_entry (subdev_entity, &isc->subdev_entities, list) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *fwnode =of_fwnode_handle (subdev_entity->epn);
@@ -511,7 +511,7 @@ static int atmel_isc_probe(struct platform_device *pdev) asd =v4l2_async_nf_add_fwnode_remote (&subdev_entity->notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (subdev_entity->epn); subdev_entity->epn =NULL ;
drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c +2 -2
@@ -493,7 +493,7 @@ static int microchip_xisc_probe(struct platform_device *pdev) }list_for_each_entry (subdev_entity, &isc->subdev_entities, list) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *fwnode =of_fwnode_handle (subdev_entity->epn);
@@ -501,7 +501,7 @@ static int microchip_xisc_probe(struct platform_device *pdev) asd =v4l2_async_nf_add_fwnode_remote (&subdev_entity->notifier, fwnode, - struct v4l2_async_subdev); + struct v4l2_async_connection);of_node_put (subdev_entity->epn); subdev_entity->epn =NULL ;
drivers/staging/media/imx/imx-media-csi.c +3 -3
@@ -1892,7 +1892,7 @@ static const struct v4l2_subdev_internal_ops csi_internal_ops = {static int imx_csi_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct csi_priv *priv =notifier_to_dev (notifier);struct media_pad *sink = &priv->sd.entity.pads[CSI_SINK_PAD ];
@@ -1913,7 +1913,7 @@ static const struct v4l2_async_notifier_operations csi_notify_ops = {static int imx_csi_async_register (struct csi_priv *priv) { -struct v4l2_async_subdev *asd =NULL ; +struct v4l2_async_connection *asd =NULL ;struct fwnode_handle *ep;unsigned int port;int ret;
@@ -1930,7 +1930,7 @@ static int imx_csi_async_register(struct csi_priv *priv) FWNODE_GRAPH_ENDPOINT_NEXT);if (ep) { asd =v4l2_async_nf_add_fwnode_remote (&priv->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (ep);
drivers/staging/media/imx/imx-media-dev-common.c +1 -1
@@ -384,7 +384,7 @@ int imx_media_dev_notifier_register(struct imx_media_dev *imxmd,int ret;/* no subdevs? just bail */ -if (list_empty (&imxmd->notifier.asd_list)) { +if (list_empty (&imxmd->notifier.asc_list)) {v4l2_err (&imxmd->v4l2_dev,"no subdevs\n" );return -ENODEV ; }
drivers/staging/media/imx/imx-media-dev.c +1 -1
@@ -20,7 +20,7 @@ static inline struct imx_media_dev *notifier2dev(struct v4l2_async_notifier *n)/* async subdev bound notifier */ static int imx_media_subdev_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct imx_media_dev *imxmd =notifier2dev (notifier);int ret;
drivers/staging/media/imx/imx-media-of.c +2 -2
@@ -19,7 +19,7 @@static int imx_media_of_add_csi (struct imx_media_dev *imxmd,struct device_node *csi_np) { -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;int ret =0 ;if (!of_device_is_available (csi_np)) {
@@ -31,7 +31,7 @@ static int imx_media_of_add_csi(struct imx_media_dev *imxmd,/* add CSI fwnode to async notifier */ asd =v4l2_async_nf_add_fwnode (&imxmd->notifier,of_fwnode_handle (csi_np), - struct v4l2_async_subdev); + struct v4l2_async_connection);if (IS_ERR (asd)) { ret =PTR_ERR (asd);if (ret == -EEXIST )
drivers/staging/media/imx/imx6-mipi-csi2.c +4 -4
@@ -636,7 +636,7 @@ static const struct v4l2_subdev_internal_ops csi2_internal_ops = {static int csi2_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct csi2_dev *csi2 =notifier_to_dev (notifier);struct media_pad *sink = &csi2->sd.entity.pads[CSI2_SINK_PAD ];
@@ -659,7 +659,7 @@ static int csi2_notify_bound(struct v4l2_async_notifier *notifier,static void csi2_notify_unbind (struct v4l2_async_notifier *notifier,struct v4l2_subdev *sd, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct csi2_dev *csi2 =notifier_to_dev (notifier);
@@ -676,7 +676,7 @@ static int csi2_async_register(struct csi2_dev *csi2)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_CSI2_DPHY , }; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct fwnode_handle *ep;int ret;
@@ -697,7 +697,7 @@ static int csi2_async_register(struct csi2_dev *csi2)dev_dbg (csi2->dev,"flags: 0x%08x\n" , vep.bus.mipi_csi2.flags); asd =v4l2_async_nf_add_fwnode_remote (&csi2->notifier, ep, - struct v4l2_async_subdev); + struct v4l2_async_connection);fwnode_handle_put (ep);if (IS_ERR (asd))
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c +1 -1
@@ -395,7 +395,7 @@ static int sun6i_isp_proc_link(struct sun6i_isp_device *isp_dev,static int sun6i_isp_proc_notifier_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *remote_subdev, -struct v4l2_async_subdev *async_subdev) +struct v4l2_async_connection *async_subdev) {struct sun6i_isp_device *isp_dev = container_of(notifier, struct sun6i_isp_device, proc.notifier);
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.h +1 -1
@@ -34,7 +34,7 @@ struct sun6i_isp_proc_source { };struct sun6i_isp_proc_async_subdev { -struct v4l2_async_subdev async_subdev; +struct v4l2_async_connection async_subdev;struct sun6i_isp_proc_source *source; };
drivers/staging/media/tegra-video/vi.c +8 -8
@@ -40,7 +40,7 @@* @subdev: V4L2 subdev */ struct tegra_vi_graph_entity { -struct v4l2_async_subdev asd; +struct v4l2_async_connection asd;struct media_entity *entity;struct v4l2_subdev *subdev; };
@@ -58,7 +58,7 @@ to_tegra_channel_buffer(struct vb2_v4l2_buffer *vb) }static inline struct tegra_vi_graph_entity * -to_tegra_vi_graph_entity (struct v4l2_async_subdev *asd) +to_tegra_vi_graph_entity (struct v4l2_async_connection *asd) { return container_of(asd, struct tegra_vi_graph_entity, asd); }
@@ -1462,9 +1462,9 @@ tegra_vi_graph_find_entity(struct tegra_vi_channel *chan, const struct fwnode_handle *fwnode) {struct tegra_vi_graph_entity *entity; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd; -list_for_each_entry (asd, &chan->notifier.asd_list, asd_entry) { +list_for_each_entry (asd, &chan->notifier.asc_list, asc_entry) { entity =to_tegra_vi_graph_entity (asd);if (entity->asd.match.fwnode == fwnode)return entity;
@@ -1578,7 +1578,7 @@ static int tegra_vi_graph_build(struct tegra_vi_channel *chan,static int tegra_vi_graph_notify_complete (struct v4l2_async_notifier *notifier) {struct tegra_vi_graph_entity *entity; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct v4l2_subdev *subdev;struct tegra_vi_channel *chan;struct tegra_vi *vi;
@@ -1608,7 +1608,7 @@ static int tegra_vi_graph_notify_complete(struct v4l2_async_notifier *notifier) }/* create links between the entities */ -list_for_each_entry (asd, &chan->notifier.asd_list, asd_entry) { +list_for_each_entry (asd, &chan->notifier.asc_list, asc_entry) { entity =to_tegra_vi_graph_entity (asd); ret =tegra_vi_graph_build (chan, entity);if (ret <0 )
@@ -1651,7 +1651,7 @@ static int tegra_vi_graph_notify_complete(struct v4l2_async_notifier *notifier)static int tegra_vi_graph_notify_bound (struct v4l2_async_notifier *notifier,struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) +struct v4l2_async_connection *asd) {struct tegra_vi_graph_entity *entity;struct tegra_vi *vi;
@@ -1775,7 +1775,7 @@ static int tegra_vi_graph_init(struct tegra_vi *vi) ret =tegra_vi_graph_parse_one (chan, remote);fwnode_handle_put (remote); -if (ret <0 ||list_empty (&chan->notifier.asd_list)) +if (ret <0 ||list_empty (&chan->notifier.asc_list))continue ; chan->notifier.ops = &tegra_vi_async_ops;
include/media/davinci/vpif_types.h +1 -1
@@ -72,7 +72,7 @@ struct vpif_capture_config {int i2c_adapter_id;const char *card_name; -struct v4l2_async_subdev *asd[VPIF_CAPTURE_MAX_CHANNELS ]; +struct v4l2_async_connection *asd[VPIF_CAPTURE_MAX_CHANNELS ]; int asd_sizes[VPIF_CAPTURE_MAX_CHANNELS]; };#endif /* _VPIF_TYPES_H */
include/media/v4l2-async.h +44 -43
194 lines not on this page · raw message
include/media/v4l2-subdev.h +2 -2
@@ -1022,7 +1022,7 @@ struct v4l2_subdev_platform_data {* either dev->of_node->fwnode or dev->fwnode (whichever is non-NULL). * @async_list: Links this subdev to a global subdev_list or * @notifier->done_list list. -* @asd: Pointer to respective &struct v4l2_async_subdev. +* @asd: Pointer to respective &struct v4l2_async_connection. * @notifier: Pointer to the managing notifier. * @subdev_notifier: A sub-device notifier implicitly registered for the sub- * device using v4l2_async_register_subdev_sensor().
@@ -1065,7 +1065,7 @@ struct v4l2_subdev {struct device *dev;struct fwnode_handle *fwnode;struct list_head async_list; -struct v4l2_async_subdev *asd; +struct v4l2_async_connection *asd;struct v4l2_async_notifier *notifier;struct v4l2_async_notifier *subdev_notifier;struct v4l2_subdev_platform_data *pdata;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 20/38 media: v4l: async: Clean up error handling in v4l2_async_match_notify
In reply to Sakari AilusAdd labels for error handling instead of doing it all in individual cases. Prepare for more functionality in this function.
--- drivers/media/v4l2-core/v4l2-async.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +12 -9
@@ -320,10 +320,8 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,return ret; ret =v4l2_async_nf_call_bound (notifier, sd, asc); -if (ret <0 ) { -v4l2_device_unregister_subdev (sd); -return ret; - } +if (ret <0 ) + goto err_unregister_subdev;/* * Depending of the function of the entities involved, we may want to
@@ -332,11 +330,8 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,* pad). */ ret =v4l2_async_create_ancillary_links (notifier, sd); -if (ret) { -v4l2_async_nf_call_unbind (notifier, sd, asc); -v4l2_device_unregister_subdev (sd); -return ret; - } +if (ret) + goto err_call_unbind;list_del (&asc->waiting_entry); sd->asd = asc;
@@ -363,6 +358,14 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier, subdev_notifier->parent = notifier;return v4l2_async_nf_try_all_subdevs (subdev_notifier); + +err_call_unbind: +v4l2_async_nf_call_unbind (notifier, sd, asc); + +err_unregister_subdev: +v4l2_device_unregister_subdev (sd); + +return ret; }/* Test all async sub-devices in a notifier for a match. */
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 21/38 media: v4l: async: Drop duplicate handling when adding connections
In reply to Sakari AilusThe connections are checked for duplicates already when the notifier is registered. This is effectively a sanity check for driver (and possibly obscure firmware) bugs. Don't do this when adding the connection.
Retain the int return type for now. It'll be needed very soon again.
--- drivers/media/v4l2-core/v4l2-async.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +8 -19
@@ -471,14 +471,11 @@ v4l2_async_nf_has_async_match_entry(struct v4l2_async_notifier *notifier,/* * Find out whether an async sub-device was set up already or whether it exists -* in a given notifier. The skip_self argument is used to skip testing the same -* sub-device in the notifier in case the sub-device has been already added to -* the notifier. +* in a given notifier. */ static bool v4l2_async_nf_has_async_match (struct v4l2_async_notifier *notifier, -struct v4l2_async_match_desc *match, -bool skip_self) +struct v4l2_async_match_desc *match) {struct v4l2_async_connection *asc;
@@ -486,7 +483,7 @@ v4l2_async_nf_has_async_match(struct v4l2_async_notifier *notifier,/* Check that an asd is not being added more than once. */ list_for_each_entry (asc, ¬ifier->asc_list, asc_entry) { -if (skip_self && &asc->match == match) +if (&asc->match == match)continue ;if (v4l2_async_match_equal (&asc->match, match))return true;
@@ -501,16 +498,14 @@ v4l2_async_nf_has_async_match(struct v4l2_async_notifier *notifier, }static int v4l2_async_nf_match_valid (struct v4l2_async_notifier *notifier, -struct v4l2_async_match_desc *match, -bool skip_self) +struct v4l2_async_match_desc *match) {struct device *dev =notifier_dev (notifier);switch (match->type) {case V4L2_ASYNC_MATCH_TYPE_I2C :case V4L2_ASYNC_MATCH_TYPE_FWNODE : -if (v4l2_async_nf_has_async_match (notifier, match, - skip_self)) { +if (v4l2_async_nf_has_async_match (notifier, match)) {dev_dbg (dev,"v4l2-async: match descriptor already listed in a notifier\n" );return -EEXIST ; }
@@ -541,7 +536,7 @@ static int __v4l2_async_nf_register(struct v4l2_async_notifier *notifier)mutex_lock (&list_lock);list_for_each_entry (asc, ¬ifier->asc_list, asc_entry) { - ret =v4l2_async_nf_match_valid (notifier, &asc->match, true); + ret =v4l2_async_nf_match_valid (notifier, &asc->match);if (ret) goto err_unlock;
@@ -670,19 +665,13 @@ EXPORT_SYMBOL_GPL(v4l2_async_nf_cleanup);static int __v4l2_async_nf_add_connection (struct v4l2_async_notifier *notifier,struct v4l2_async_connection *asc) { -int ret; -mutex_lock (&list_lock); - ret =v4l2_async_nf_match_valid (notifier, &asc->match, false); -if (ret) - goto unlock; -list_add_tail (&asc->asc_entry, ¬ifier->asc_list); -unlock:mutex_unlock (&list_lock); -return ret; + +return 0 ; } struct v4l2_async_connection *
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 22/38 media: v4l: async: Rework internal lists
In reply to Sakari AilusThis patch re-arranges internal V4L2 async lists for preparation of supporting multiple connections per sub-device as well as cleaning up used lists.
The list of unbound V4L2 sub-devices shall be maintained for the purpose of listing those sub-devices only, not for their bindin status. Also, the V4L2 async connections now have, instead of two list entries, a single list entry in the notifier's list, be that either waiting or done lists, while the notifier's asc_list is removed.
The one-to-one relation between a sub-device and a connection is still maintained in this patch.
--- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- .../platform/renesas/rcar-vin/rcar-core.c | 2 +- .../platform/renesas/rzg2l-cru/rzg2l-core.c | 2 +- drivers/media/platform/xilinx/xilinx-vipp.c | 8 +- drivers/media/v4l2-core/v4l2-async.c | 102 +++++++++--------- .../staging/media/imx/imx-media-dev-common.c | 2 +- drivers/staging/media/tegra-video/vi.c | 6 +- include/media/v4l2-async.h | 9 +- 8 files changed, 68 insertions(+), 65 deletions(-)
drivers/media/pci/intel/ipu3/ipu3-cio2.c +1 -1
@@ -1421,7 +1421,7 @@ static int cio2_notifier_complete(struct v4l2_async_notifier *notifier)struct cio2_queue *q;int ret; -list_for_each_entry (asd, &cio2->notifier.asc_list, asc_entry) { +list_for_each_entry (asd, &cio2->notifier.done_list, asc_entry) { s_asd =to_sensor_asd (asd); q = &cio2->queue[s_asd->csi2.port];
drivers/media/platform/renesas/rcar-vin/rcar-core.c +1 -1
@@ -395,7 +395,7 @@ static int rvin_group_notifier_init(struct rvin_dev *vin, unsigned int port, } } -if (list_empty (&vin->group->notifier.asc_list)) +if (list_empty (&vin->group->notifier.waiting_list))return 0 ; vin->group->notifier.ops = &rvin_group_notify_ops;
drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +1 -1
@@ -190,7 +190,7 @@ static int rzg2l_cru_mc_parse_of_graph(struct rzg2l_cru_dev *cru) cru->notifier.ops = &rzg2l_cru_async_ops; -if (list_empty (&cru->notifier.asc_list)) +if (list_empty (&cru->notifier.waiting_list))return 0 ; ret =v4l2_async_nf_register (&cru->v4l2_dev, &cru->notifier);
drivers/media/platform/xilinx/xilinx-vipp.c +4 -4
@@ -56,7 +56,7 @@ xvip_graph_find_entity(struct xvip_composite_device *xdev,struct xvip_graph_entity *entity;struct v4l2_async_connection *asd; -list_for_each_entry (asd, &xdev->notifier.asc_list, asc_entry) { +list_for_each_entry (asd, &xdev->notifier.done_list, asc_entry) { entity =to_xvip_entity (asd);if (entity->asd.match.fwnode == fwnode)return entity;
@@ -291,7 +291,7 @@ static int xvip_graph_notify_complete(struct v4l2_async_notifier *notifier)dev_dbg (xdev->dev,"notify complete, all subdevs registered\n" );/* Create links for every entity. */ -list_for_each_entry (asd, &xdev->notifier.asc_list, asc_entry) { +list_for_each_entry (asd, &xdev->notifier.done_list, asc_entry) { entity =to_xvip_entity (asd); ret =xvip_graph_build_one (xdev, entity);if (ret <0 )
@@ -393,7 +393,7 @@ static int xvip_graph_parse(struct xvip_composite_device *xdev)if (ret <0 )return 0 ; -list_for_each_entry (asd, &xdev->notifier.asc_list, asc_entry) { +list_for_each_entry (asd, &xdev->notifier.waiting_list, asc_entry) { entity =to_xvip_entity (asd); ret =xvip_graph_parse_one (xdev, entity->asd.match.fwnode);if (ret <0 ) {
@@ -501,7 +501,7 @@ static int xvip_graph_init(struct xvip_composite_device *xdev) goto done; } -if (list_empty (&xdev->notifier.asc_list)) { +if (list_empty (&xdev->notifier.waiting_list)) {dev_err (xdev->dev,"no subdev found in graph\n" ); ret = -ENOENT ; goto done;
drivers/media/v4l2-core/v4l2-async.c +54 -48
226 lines not on this page · raw message
drivers/staging/media/imx/imx-media-dev-common.c +1 -1
@@ -384,7 +384,7 @@ int imx_media_dev_notifier_register(struct imx_media_dev *imxmd,int ret;/* no subdevs? just bail */ -if (list_empty (&imxmd->notifier.asc_list)) { +if (list_empty (&imxmd->notifier.waiting_list)) {v4l2_err (&imxmd->v4l2_dev,"no subdevs\n" );return -ENODEV ; }
drivers/staging/media/tegra-video/vi.c +3 -3
@@ -1464,7 +1464,7 @@ tegra_vi_graph_find_entity(struct tegra_vi_channel *chan,struct tegra_vi_graph_entity *entity;struct v4l2_async_connection *asd; -list_for_each_entry (asd, &chan->notifier.asc_list, asc_entry) { +list_for_each_entry (asd, &chan->notifier.done_list, asc_entry) { entity =to_tegra_vi_graph_entity (asd);if (entity->asd.match.fwnode == fwnode)return entity;
@@ -1608,7 +1608,7 @@ static int tegra_vi_graph_notify_complete(struct v4l2_async_notifier *notifier) }/* create links between the entities */ -list_for_each_entry (asd, &chan->notifier.asc_list, asc_entry) { +list_for_each_entry (asd, &chan->notifier.done_list, asc_entry) { entity =to_tegra_vi_graph_entity (asd); ret =tegra_vi_graph_build (chan, entity);if (ret <0 )
@@ -1775,7 +1775,7 @@ static int tegra_vi_graph_init(struct tegra_vi *vi) ret =tegra_vi_graph_parse_one (chan, remote);fwnode_handle_put (remote); -if (ret <0 ||list_empty (&chan->notifier.asc_list)) +if (ret <0 ||list_empty (&chan->notifier.waiting_list))continue ; chan->notifier.ops = &tegra_vi_async_ops;
include/media/v4l2-async.h +3 -6
@@ -66,9 +66,8 @@ struct v4l2_async_match_desc {* * @match: struct of match type and per-bus type matching data sets * @asc_entry: used to add struct v4l2_async_connection objects to the -* master notifier @asc_list -* @waiting_entry: used to link struct v4l2_async_connection objects, waiting to -* be probed, to a notifier->waiting_list list +* notifier @waiting_list or @done_list +* @sd: the related sub-device * * When this struct is used as a member in a driver specific struct, * the driver specific struct shall contain the &struct
@@ -77,7 +76,7 @@ struct v4l2_async_match_desc {struct v4l2_async_connection {struct v4l2_async_match_desc match;struct list_head asc_entry; -struct list_head waiting_entry; +struct v4l2_subdev *sd; };/**
@@ -106,7 +105,6 @@ struct v4l2_async_notifier_operations {* @v4l2_dev: v4l2_device of the root notifier, NULL otherwise * @sd: sub-device that registered the notifier, NULL otherwise * @parent: parent notifier -* @asc_list: master list of struct v4l2_async_connection * @waiting_list: list of struct v4l2_async_connection, waiting for their * drivers * @done_list: list of struct v4l2_subdev, already probed
@@ -117,7 +115,6 @@ struct v4l2_async_notifier {struct v4l2_device *v4l2_dev;struct v4l2_subdev *sd;struct v4l2_async_notifier *parent; -struct list_head asc_list;struct list_head waiting_list;struct list_head done_list;struct list_head notifier_entry;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 23/38 media: v4l: async: Obtain async connection based on sub-device
In reply to Sakari AilusAdd v4l2_async_connection_unique() function for obtaining a struct v4l2_async_connection, typically allocated by drivers together with their own information on an external sub-device.
The relation between connections and sub-devices still remains 1:1 but this code becomes more complex when the relation soon changes.
--- .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 7 ++++++- .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 8 ++++++-- drivers/media/platform/ti/omap3isp/isp.h | 13 +++++++++++-- drivers/media/platform/ti/omap3isp/ispccdc.c | 13 +++++++++++-- drivers/media/platform/ti/omap3isp/ispccp2.c | 2 ++ drivers/media/platform/ti/omap3isp/ispcsi2.c | 2 ++ drivers/media/platform/ti/omap3isp/ispcsiphy.c | 15 ++++++++++++--- drivers/media/v4l2-core/v4l2-async.c | 7 +++++++ include/media/v4l2-async.h | 11 +++++++++++ 9 files changed, 68 insertions(+), 10 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c +6 -1
@@ -381,6 +381,7 @@ static int rkisp1_csi_s_stream(struct v4l2_subdev *sd, int enable)struct rkisp1_csi *csi =to_rkisp1_csi (sd);struct rkisp1_device *rkisp1 = csi->rkisp1;struct rkisp1_sensor_async *source_asd; +struct v4l2_async_connection *asc;struct media_pad *source_pad;struct v4l2_subdev *source;int ret;
@@ -406,7 +407,11 @@ static int rkisp1_csi_s_stream(struct v4l2_subdev *sd, int enable)return -EPIPE ; } - source_asd = container_of(source->asd, struct rkisp1_sensor_async, asd); + asc =v4l2_async_connection_unique (source); +if (!asc) +return -EPIPE ; + + source_asd = container_of(asc, struct rkisp1_sensor_async, asd);if (source_asd->mbus_type !=V4L2_MBUS_CSI2_DPHY )return -EINVAL ;
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +6 -2
@@ -868,9 +868,13 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable) mbus_flags =0 ; }else {const struct rkisp1_sensor_async *asd; +struct v4l2_async_connection *asc; - asd =container_of (rkisp1->source->asd, - struct rkisp1_sensor_async, asd); + asc =v4l2_async_connection_unique (rkisp1->source); +if (!asc) +return -EPIPE ; + + asd = container_of(asc, struct rkisp1_sensor_async, asd); mbus_type = asd->mbus_type; mbus_flags = asd->mbus_flags;
drivers/media/platform/ti/omap3isp/isp.h +11 -2
@@ -224,8 +224,17 @@ struct isp_async_subdev {struct isp_bus_cfg bus; }; -#define v4l2_subdev_to_bus_cfg (sd) \ - (&container_of((sd)->asd, struct isp_async_subdev, asd)->bus) +static inline struct isp_bus_cfg * +v4l2_subdev_to_bus_cfg (struct v4l2_subdev *sd) +{ +struct v4l2_async_connection *asc; + + asc =v4l2_async_connection_unique (sd); +if (!asc) +return NULL ; + + return &container_of(asc, struct isp_async_subdev, asd)->bus; +}#define v4l2_dev_to_isp_device (dev) \ container_of(dev, struct isp_device, v4l2_dev)
drivers/media/platform/ti/omap3isp/ispccdc.c +11 -2
@@ -1140,8 +1140,13 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)if (ccdc->input ==CCDC_INPUT_PARALLEL ) {struct v4l2_subdev *sd =to_isp_pipeline (&ccdc->subdev.entity)->external; +struct isp_bus_cfg *bus_cfg; - parcfg = &v4l2_subdev_to_bus_cfg (sd)->bus.parallel; + bus_cfg =v4l2_subdev_to_bus_cfg (sd); +if (WARN_ON (!bus_cfg)) +return ; + + parcfg = &bus_cfg->bus.parallel; ccdc->bt656 = parcfg->bt656; }
@@ -2436,7 +2441,11 @@ static int ccdc_link_validate(struct v4l2_subdev *sd,if (ccdc->input ==CCDC_INPUT_PARALLEL ) {struct v4l2_subdev *sd =media_entity_to_v4l2_subdev (link->source->entity); -struct isp_bus_cfg *bus_cfg =v4l2_subdev_to_bus_cfg (sd); +struct isp_bus_cfg *bus_cfg; + + bus_cfg =v4l2_subdev_to_bus_cfg (sd); +if (WARN_ON (!bus_cfg)) +return -EPIPE ; parallel_shift = bus_cfg->bus.parallel.data_lane_shift; }else {
drivers/media/platform/ti/omap3isp/ispccp2.c +2 -0
@@ -360,6 +360,8 @@ static int ccp2_if_configure(struct isp_ccp2_device *ccp2) pad =media_pad_remote_pad_first (&ccp2->pads[CCP2_PAD_SINK ]); sensor =media_entity_to_v4l2_subdev (pad->entity); buscfg =v4l2_subdev_to_bus_cfg (pipe->external); +if (WARN_ON (!buscfg)) +return -EPIPE ; ret =ccp2_phyif_config (ccp2, &buscfg->bus.ccp2);if (ret <0 )
drivers/media/platform/ti/omap3isp/ispcsi2.c +2 -0
@@ -564,6 +564,8 @@ static int csi2_configure(struct isp_csi2_device *csi2) pad =media_pad_remote_pad_first (&csi2->pads[CSI2_PAD_SINK ]); sensor =media_entity_to_v4l2_subdev (pad->entity); buscfg =v4l2_subdev_to_bus_cfg (pipe->external); +if (WARN_ON (!buscfg)) +return -EPIPE ; csi2->frame_skip =0 ;v4l2_subdev_call (sensor, sensor, g_skip_frames, &csi2->frame_skip);
drivers/media/platform/ti/omap3isp/ispcsiphy.c +12 -3
@@ -163,13 +163,17 @@ static int csiphy_set_power(struct isp_csiphy *phy, u32 power)static int omap3isp_csiphy_config (struct isp_csiphy *phy) {struct isp_pipeline *pipe =to_isp_pipeline (phy->entity); -struct isp_bus_cfg *buscfg =v4l2_subdev_to_bus_cfg (pipe->external); +struct isp_bus_cfg *buscfg;struct isp_csiphy_lanes_cfg *lanes;int csi2_ddrclk_khz;unsigned int num_data_lanes, used_lanes =0 ;unsigned int i;u32 reg; + buscfg =v4l2_subdev_to_bus_cfg (pipe->external); +if (WARN_ON (!buscfg)) +return -EPIPE ; +if (buscfg->interface ==ISP_INTERFACE_CCP2B_PHY1 || buscfg->interface ==ISP_INTERFACE_CCP2B_PHY2 ) { lanes = &buscfg->bus.ccp2.lanecfg;
@@ -306,8 +310,13 @@ void omap3isp_csiphy_release(struct isp_csiphy *phy)mutex_lock (&phy->mutex);if (phy->entity) {struct isp_pipeline *pipe =to_isp_pipeline (phy->entity); -struct isp_bus_cfg *buscfg = -v4l2_subdev_to_bus_cfg (pipe->external); +struct isp_bus_cfg *buscfg; + + buscfg =v4l2_subdev_to_bus_cfg (pipe->external); +if (WARN_ON (!buscfg)) { +mutex_unlock (&phy->mutex); +return ; + }csiphy_routing_cfg (phy, buscfg->interface, false, buscfg->bus.ccp2.phy_layer);
drivers/media/v4l2-core/v4l2-async.c +7 -0
@@ -751,6 +751,13 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, int adapter_id, }EXPORT_SYMBOL_GPL (__v4l2_async_nf_add_i2c); +struct v4l2_async_connection * +v4l2_async_connection_unique (struct v4l2_subdev *sd) +{ +return sd->asd; +} +EXPORT_SYMBOL_GPL (v4l2_async_connection_unique); +int v4l2_async_register_subdev (struct v4l2_subdev *sd) {struct v4l2_async_notifier *subdev_notifier;
include/media/v4l2-async.h +11 -0
@@ -210,6 +210,17 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, ((type *)__v4l2_async_nf_add_i2c (notifier, adapter, address, \sizeof (type))) +/** +* v4l2_async_connection_unique - return a unique &struct v4l2_async_connection +* for a sub-device +* @sd: the sub-device +* +* Return an async connection for a sub-device, when there is a single +* one only. + */ +struct v4l2_async_connection * +v4l2_async_connection_unique (struct v4l2_subdev *sd); +/** * v4l2_async_nf_register - registers a subdevice asynchronous notifier *
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 24/38 media: v4l: async: Allow multiple connections between entities
In reply to Sakari AilusWhen the v4l2-async framework was introduced, the use case for it was to connect a camera sensor with a parallel receiver. Both tended to be rather simple devices with a single connection between them.
The framework has been since improved in multiple ways but there are limitations that have remained, for instance the assumption an async sub-device is connected towards a single notifier and via a single link only.
This patch enables connecting a sub-device to one or more notifiers simultaneously, with one or more connections per notifier. The notifier information is moved from the sub-device to the connection and the connections in sub-device are no longer a pointer but a linked list.
--- drivers/media/v4l2-core/v4l2-async.c | 149 ++++++++++++++------------- include/media/v4l2-async.h | 17 +-- include/media/v4l2-subdev.h | 7 +- 3 files changed, 90 insertions(+), 83 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +76 -73
@@ -313,29 +313,43 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier, struct v4l2_async_connection *asc) {struct v4l2_async_notifier *subdev_notifier; +bool registered = false;int ret; - ret =v4l2_device_register_subdev (v4l2_dev, sd); -if (ret <0 ) -return ret; +if (list_empty (&sd->asc_list)) { + ret =v4l2_device_register_subdev (v4l2_dev, sd); +if (ret <0 ) +return ret; + registered = true; + } ret =v4l2_async_nf_call_bound (notifier, sd, asc); -if (ret <0 ) +if (ret <0 ) { +if (asc->match.type ==V4L2_ASYNC_MATCH_TYPE_FWNODE ) +dev_dbg (notifier_dev (notifier), +"failed binding %pfw (%d)\n" , + asc->match.fwnode, ret); goto err_unregister_subdev; + } -/* -* Depending of the function of the entities involved, we may want to -* create links between them (for example between a sensor and its lens -* or between a sensor's source pad and the connected device's sink -* pad). -*/ - ret =v4l2_async_create_ancillary_links (notifier, sd); -if (ret) - goto err_call_unbind; - - sd->asd = asc; - sd->notifier = notifier; +if (registered) { +/* +* Depending of the function of the entities involved, we may +* want to create links between them (for example between a +* sensor and its lens or between a sensor's source pad and the +* connected device's sink pad). +*/ + ret =v4l2_async_create_ancillary_links (notifier, sd); +if (ret) { +if (asc->match.type ==V4L2_ASYNC_MATCH_TYPE_FWNODE ) +dev_dbg (notifier_dev (notifier), +"failed creating links for %pfw (%d)\n" , + asc->match.fwnode, ret); + goto err_call_unbind; + } + } +list_add (&asc->asc_subdev_entry, &sd->asc_list); asc->sd = sd;/* Move from the waiting list to notifier's done */
@@ -362,9 +376,11 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier, err_call_unbind:v4l2_async_nf_call_unbind (notifier, sd, asc); +list_del (&asc->asc_subdev_entry); err_unregister_subdev: -v4l2_device_unregister_subdev (sd); +if (registered) +v4l2_device_unregister_subdev (sd);return ret; }
@@ -410,15 +426,16 @@ v4l2_async_nf_try_all_subdevs(struct v4l2_async_notifier *notifier)return 0 ; } -static void v4l2_async_cleanup (struct v4l2_subdev *sd) +static void v4l2_async_unbind_subdev_one (struct v4l2_async_notifier *notifier, +struct v4l2_async_connection *asc) { -v4l2_device_unregister_subdev (sd); -/* -* Subdevice driver will reprobe and put the subdev back -* onto the list -*/ -list_del_init (&sd->async_list); - sd->asd =NULL ; +list_move_tail (&asc->asc_entry, ¬ifier->waiting_list); +if (list_is_singular (&asc->asc_subdev_entry)) { +v4l2_async_nf_call_unbind (notifier, asc->sd, asc); +v4l2_device_unregister_subdev (asc->sd); + asc->sd =NULL ; + } +list_del (&asc->asc_subdev_entry); }/* Unbind all sub-devices in the notifier tree. */
@@ -435,11 +452,7 @@ v4l2_async_nf_unbind_all_subdevs(struct v4l2_async_notifier *notifier)if (subdev_notifier)v4l2_async_nf_unbind_all_subdevs (subdev_notifier); -v4l2_async_nf_call_unbind (notifier, asc->sd, asc); -v4l2_async_cleanup (asc->sd); -list_move_tail (&asc->asc_entry, ¬ifier->waiting_list); -list_move (&asc->sd->async_list, &subdev_list); - asc->sd =NULL ; +v4l2_async_unbind_subdev_one (notifier, asc); } notifier->parent =NULL ;
@@ -456,13 +469,9 @@ v4l2_async_nf_has_async_match_entry(struct v4l2_async_notifier *notifier,if (v4l2_async_match_equal (&asc->match, match))return true; -list_for_each_entry (asc, ¬ifier->done_list, asc_entry) { -if (WARN_ON (!asc->sd->asd)) -continue ; - +list_for_each_entry (asc, ¬ifier->done_list, asc_entry)if (v4l2_async_match_equal (&asc->match, match))return true; - }return false; }
@@ -642,16 +651,12 @@ static void __v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier)WARN_ON (!list_empty (¬ifier->done_list));list_for_each_entry_safe (asc, tmp, ¬ifier->waiting_list, asc_entry) { -switch (asc->match.type) { -case V4L2_ASYNC_MATCH_TYPE_FWNODE : -fwnode_handle_put (asc->match.fwnode); -break ; -default : -break ; - } -list_del (&asc->asc_entry);v4l2_async_nf_call_destroy (notifier, asc); + +if (asc->match.type ==V4L2_ASYNC_MATCH_TYPE_FWNODE ) +fwnode_handle_put (asc->match.fwnode); +kfree (asc); } }
@@ -666,16 +671,14 @@ void v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier) }EXPORT_SYMBOL_GPL (v4l2_async_nf_cleanup); -static int __v4l2_async_nf_add_connection (struct v4l2_async_notifier *notifier, -struct v4l2_async_connection *asc) +static void __v4l2_async_nf_add_connection (struct v4l2_async_notifier *notifier, +struct v4l2_async_connection *asc) {mutex_lock (&list_lock);list_add_tail (&asc->asc_entry, ¬ifier->waiting_list);mutex_unlock (&list_lock); - -return 0 ; } struct v4l2_async_connection *
@@ -684,21 +687,16 @@ __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier, unsigned int asc_struct_size) {struct v4l2_async_connection *asc; -int ret; asc =kzalloc (asc_struct_size,GFP_KERNEL );if (!asc)return ERR_PTR (-ENOMEM ); + asc->notifier = notifier; asc->match.type =V4L2_ASYNC_MATCH_TYPE_FWNODE ; asc->match.fwnode =fwnode_handle_get (fwnode); - ret =__v4l2_async_nf_add_connection (notifier, asc); -if (ret) { -fwnode_handle_put (fwnode); -kfree (asc); -return ERR_PTR (ret); - } +__v4l2_async_nf_add_connection (notifier, asc);return asc; }
@@ -731,21 +729,17 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, int adapter_id, unsigned short address, unsigned int asc_struct_size) { struct v4l2_async_connection *asc; -int ret; asc =kzalloc (asc_struct_size,GFP_KERNEL );if (!asc)return ERR_PTR (-ENOMEM ); + asc->notifier = notifier; asc->match.type =V4L2_ASYNC_MATCH_TYPE_I2C ; asc->match.i2c.adapter_id = adapter_id; asc->match.i2c.address = address; - ret =__v4l2_async_nf_add_connection (notifier, asc); -if (ret) { -kfree (asc); -return ERR_PTR (ret); - } +__v4l2_async_nf_add_connection (notifier, asc);return asc; }
@@ -754,7 +748,11 @@ EXPORT_SYMBOL_GPL(__v4l2_async_nf_add_i2c);struct v4l2_async_connection *v4l2_async_connection_unique (struct v4l2_subdev *sd) { -return sd->asd; +if (!list_is_singular (&sd->asc_list)) +return NULL ; + +return list_first_entry (&sd->asc_list, + struct v4l2_async_connection, asc_subdev_entry); }EXPORT_SYMBOL_GPL (v4l2_async_connection_unique);
@@ -762,8 +760,11 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd) {struct v4l2_async_notifier *subdev_notifier;struct v4l2_async_notifier *notifier; +struct v4l2_async_connection *asc;int ret; +INIT_LIST_HEAD (&sd->asc_list); +/* * No reference taken. The reference is held by the device (struct * v4l2_subdev.dev), and async sub-device does not exist independently
@@ -786,7 +787,6 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)list_for_each_entry (notifier, ¬ifier_list, notifier_entry) {struct v4l2_device *v4l2_dev =v4l2_async_nf_find_v4l2_dev (notifier); -struct v4l2_async_connection *asc;if (!v4l2_dev)continue ;
@@ -823,11 +823,8 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)if (subdev_notifier)v4l2_async_nf_unbind_all_subdevs (subdev_notifier); -if (sd->asd) { -v4l2_async_nf_call_unbind (notifier, sd, sd->asd); - sd->asd->sd =NULL ; - } -v4l2_async_cleanup (sd); +if (asc) +v4l2_async_unbind_subdev_one (notifier, asc);mutex_unlock (&list_lock);
@@ -837,6 +834,8 @@ EXPORT_SYMBOL(v4l2_async_register_subdev);void v4l2_async_unregister_subdev (struct v4l2_subdev *sd) { +struct v4l2_async_connection *asc, *asc_tmp; +if (!sd->async_list.next)return ;
@@ -849,15 +848,19 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)kfree (sd->subdev_notifier); sd->subdev_notifier =NULL ; -if (sd->asd) { -struct v4l2_async_notifier *notifier = sd->notifier; +if (sd->asc_list.next) { +list_for_each_entry_safe (asc, asc_tmp, &sd->asc_list, + asc_subdev_entry) { +list_move (&asc->asc_entry, + &asc->notifier->waiting_list); -list_move (&sd->asd->asc_entry, ¬ifier->waiting_list); -v4l2_async_nf_call_unbind (notifier, sd, sd->asd); - sd->asd->sd =NULL ; +v4l2_async_unbind_subdev_one (asc->notifier, asc); +list_del (&asc->asc_subdev_entry); + } } -v4l2_async_cleanup (sd); +list_del (&sd->async_list); + sd->async_list.next =NULL ;mutex_unlock (&list_lock); }
include/media/v4l2-async.h +11 -6
@@ -62,27 +62,32 @@ struct v4l2_async_match_desc { };/** -* struct v4l2_async_connection - connection descriptor, as known to a bridge +* struct v4l2_async_connection - sub-device connection descriptor, as known to +* a bridge * * @match: struct of match type and per-bus type matching data sets +* @notifier: the async notifier the connection is related to * @asc_entry: used to add struct v4l2_async_connection objects to the * notifier @waiting_list or @done_list +* @asc_subdev_entry: entry in struct v4l2_async_subdev.asc_list list * @sd: the related sub-device * -* When this struct is used as a member in a driver specific struct, -* the driver specific struct shall contain the &struct -* v4l2_async_connection as its first member. +* When this struct is used as a member in a driver specific struct, the driver +* specific struct shall contain the &struct v4l2_async_connection as its first +* member. */ struct v4l2_async_connection {struct v4l2_async_match_desc match; +struct v4l2_async_notifier *notifier;struct list_head asc_entry; +struct list_head asc_subdev_entry;struct v4l2_subdev *sd; };/** * struct v4l2_async_notifier_operations - Asynchronous V4L2 notifier operations -* @bound: a subdevice driver has successfully probed one of the subdevices -* @complete: All subdevices have been probed successfully. The complete +* @bound: a sub-device has been bound by the given connection +* @complete: All connections have been bound successfully. The complete * callback is only executed for the root notifier. * @unbind: a subdevice is leaving * @destroy: the asc is about to be freed
include/media/v4l2-subdev.h +3 -4
@@ -1022,10 +1022,10 @@ struct v4l2_subdev_platform_data {* either dev->of_node->fwnode or dev->fwnode (whichever is non-NULL). * @async_list: Links this subdev to a global subdev_list or * @notifier->done_list list. -* @asd: Pointer to respective &struct v4l2_async_connection. -* @notifier: Pointer to the managing notifier. * @subdev_notifier: A sub-device notifier implicitly registered for the sub- * device using v4l2_async_register_subdev_sensor(). +* @asc_list: Async connection list, of &struct +* v4l2_async_connection.subdev_entry. * @pdata: common part of subdevice platform data * @state_lock: A pointer to a lock used for all the subdev's states, set by the * driver. This is optional. If NULL, each state instance will get
@@ -1065,9 +1065,8 @@ struct v4l2_subdev {struct device *dev;struct fwnode_handle *fwnode;struct list_head async_list; -struct v4l2_async_connection *asd; -struct v4l2_async_notifier *notifier;struct v4l2_async_notifier *subdev_notifier; +struct list_head asc_list;struct v4l2_subdev_platform_data *pdata;struct mutex *state_lock;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 25/38 media: v4l: async: Drop unneeded list entry initialisation
In reply to Sakari AilusThe list entry is initialised as a head in v4l2_async_register_subdev() just before being added to the list. This isn't needed, drop the initialisation.
--- drivers/media/v4l2-core/v4l2-async.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +0 -2
@@ -782,8 +782,6 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)mutex_lock (&list_lock); -INIT_LIST_HEAD (&sd->async_list); -list_for_each_entry (notifier, ¬ifier_list, notifier_entry) {struct v4l2_device *v4l2_dev =v4l2_async_nf_find_v4l2_dev (notifier);
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 26/38 media: v4l: async: Try more connections
In reply to Sakari AilusWhen an async sub-device is registered, it used to be that the first one of its connections were matched when found. Continue looking for matches until a notifier no longer has any.
--- drivers/media/v4l2-core/v4l2-async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +2 -2
@@ -789,6 +789,7 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)if (!v4l2_dev)continue ; +again: asc =v4l2_async_find_match (notifier, sd);if (!asc)continue ;
@@ -801,13 +802,12 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)if (ret) goto err_unbind; - goto out_unlock; + goto again; }/* None matched, wait for hot-plugging */ list_add (&sd->async_list, &subdev_list); -out_unlock:mutex_unlock (&list_lock);return 0 ;
Signature · 1 line
2.39.2
Mauro Carvalho Chehab
maintainerRe: [PATCH v6 26/38] media: v4l: async: Try more connections
Em Thu, 27 Jul 2023 08:42:43 +0300
Sakari Ailus <[email protected]> escreveu:
Quoted 26 lines
When an async sub-device is registered, it used to be that the first one of its connections were matched when found. Continue looking for matches until a notifier no longer has any.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/v4l2-core/v4l2-async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/media/v4l2-core/v4l2-async.c +1
-0@@ -789,6 +789,7 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)if (!v4l2_dev)continue ; +again: asc =v4l2_async_find_match (notifier, sd);if (!asc)continue ;
drivers/media/v4l2-core/v4l2-async.c int v4l2_async_register_subdev(struct v4l2_subdev *sd) · line 806
Quoted 6 lines
drivers/media/v4l2-core/v4l2-async.c +1
-1@@ -801,13 +802,12 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)if (ret) goto err_unbind; - goto out_unlock; + goto again; }
Using a goto here instead of a do {} while is not nice. I'll merge it as-is, but please send a followup patch using a proper loop.
Regards
Thanks,
Mauro
Sakari Ailus
maintainerPATCH v6 27/38 media: v4l: async: Support fwnode endpoint list matching for subdevs
In reply to Sakari AilusSupport matching V4L2 async sub-devices based on particular fwnode endpoint. This makes it possible to instantiate multiple V4L2 sub-devices based on given fwnode endpoints from a single device, based on driver needs.
--- drivers/media/v4l2-core/v4l2-async.c | 41 +++++++++++++++++++++++++++ drivers/media/v4l2-core/v4l2-subdev.c | 13 +++++++++ include/media/v4l2-async.h | 30 ++++++++++++++++++++ include/media/v4l2-subdev.h | 8 ++++-- 4 files changed, 90 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +41 -0
@@ -134,6 +134,30 @@ static bool match_fwnode(struct v4l2_async_notifier *notifier,"v4l2-async: matching for notifier %pfw, sd fwnode %pfw\n" , dev_fwnode(notifier_dev(notifier)), sd->fwnode); +if (!list_empty (&sd->async_subdev_endpoint_list)) { +struct v4l2_async_subdev_endpoint *ase; + +dev_dbg (sd->dev, +"v4l2-async: endpoint fwnode list available, looking for %pfw\n" , + match->fwnode); + +list_for_each_entry (ase, &sd->async_subdev_endpoint_list, + async_subdev_endpoint_entry) { +bool matched = ase->endpoint == match->fwnode; + +dev_dbg (sd->dev, +"v4l2-async: endpoint-endpoint match %sfound with %pfw\n" , + matched ?"" :"not " , ase->endpoint); + +if (matched) +return true; + } + +dev_dbg (sd->dev,"async: no endpoint matched\n" ); + +return false; + } +if (match_fwnode_one (notifier, sd, sd->fwnode, match))return true;
@@ -745,6 +769,23 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, int adapter_id, }EXPORT_SYMBOL_GPL (__v4l2_async_nf_add_i2c); +int v4l2_async_subdev_endpoint_add (struct v4l2_subdev *sd, +struct fwnode_handle *fwnode) +{ +struct v4l2_async_subdev_endpoint *ase; + + ase =kmalloc (sizeof (*ase),GFP_KERNEL ); +if (!ase) +return -ENOMEM ; + + ase->endpoint = fwnode; +list_add (&ase->async_subdev_endpoint_entry, + &sd->async_subdev_endpoint_list); + +return 0 ; +} +EXPORT_SYMBOL_GPL (v4l2_async_subdev_endpoint_add); +struct v4l2_async_connection *v4l2_async_connection_unique (struct v4l2_subdev *sd) {
drivers/media/v4l2-core/v4l2-subdev.c +13 -0
@@ -1467,8 +1467,20 @@ EXPORT_SYMBOL_GPL(__v4l2_subdev_init_finalize);void v4l2_subdev_cleanup (struct v4l2_subdev *sd) { +struct v4l2_async_subdev_endpoint *ase, *ase_tmp; +__v4l2_subdev_state_free (sd->active_state); sd->active_state =NULL ; + +if (list_empty (&sd->async_subdev_endpoint_list)) +return ; + +list_for_each_entry_safe (ase, ase_tmp, &sd->async_subdev_endpoint_list, + async_subdev_endpoint_entry) { +list_del (&ase->async_subdev_endpoint_entry); + +kfree (ase); + } }EXPORT_SYMBOL_GPL (v4l2_subdev_cleanup);
@@ -2182,6 +2194,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops) sd->dev_priv =NULL ; sd->host_priv =NULL ; sd->privacy_led =NULL ; +INIT_LIST_HEAD (&sd->async_subdev_endpoint_list);#if defined(CONFIG_MEDIA_CONTROLLER ) sd->entity.name = sd->name; sd->entity.obj_type =MEDIA_ENTITY_TYPE_V4L2_SUBDEV ;
include/media/v4l2-async.h +30 -0
@@ -125,6 +125,18 @@ struct v4l2_async_notifier {struct list_head notifier_entry; }; +/** +* struct v4l2_async_subdev_endpoint - Entry in sub-device's fwnode list +* +* @async_subdev_endpoint_entry: An entry in async_subdev_endpoint_list of +* &struct v4l2_subdev +* @endpoint: Endpoint fwnode agains which to match the sub-device +*/ +struct v4l2_async_subdev_endpoint { +struct list_head async_subdev_endpoint_entry; +struct fwnode_handle *endpoint; +}; +/** * v4l2_async_debug_init - Initialize debugging tools. *
@@ -215,6 +227,24 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, ((type *)__v4l2_async_nf_add_i2c (notifier, adapter, address, \sizeof (type))) +/** +* v4l2_async_subdev_endpoint_add - Add an endpoint fwnode to async sub-device +* matching list +* +* @sd: the sub-device +* @fwnode: the endpoint fwnode to match +* +* Add a fwnode to the async sub-device's matching list. This allows registering +* multiple async sub-devices from a single device. +* +* Note that calling v4l2_subdev_cleanup() as part of the sub-device's cleanup +* if endpoints have been added to the sub-device's fwnode matching list. +* +* Returns an error on failure, 0 on success. + */ +int v4l2_async_subdev_endpoint_add (struct v4l2_subdev *sd, +struct fwnode_handle *fwnode); +/** * v4l2_async_connection_unique - return a unique &struct v4l2_async_connection * for a sub-device
include/media/v4l2-subdev.h +6 -2
@@ -1022,6 +1022,8 @@ struct v4l2_subdev_platform_data {* either dev->of_node->fwnode or dev->fwnode (whichever is non-NULL). * @async_list: Links this subdev to a global subdev_list or * @notifier->done_list list. +* @async_subdev_endpoint_list: List entry in async_subdev_endpoint_entry of +* &struct v4l2_async_subdev_endpoint. * @subdev_notifier: A sub-device notifier implicitly registered for the sub- * device using v4l2_async_register_subdev_sensor(). * @asc_list: Async connection list, of &struct
@@ -1065,6 +1067,7 @@ struct v4l2_subdev {struct device *dev;struct fwnode_handle *fwnode;struct list_head async_list; +struct list_head async_subdev_endpoint_list;struct v4l2_async_notifier *subdev_notifier;struct list_head asc_list;struct v4l2_subdev_platform_data *pdata;
@@ -1382,8 +1385,9 @@ int __v4l2_subdev_init_finalize(struct v4l2_subdev *sd, const char *name,* v4l2_subdev_cleanup() - Releases the resources allocated by the subdevice * @sd: The subdevice * -* This function will release the resources allocated in -* v4l2_subdev_init_finalize. +* Clean up a V4L2 async sub-device. Must be called for a sub-device as part of +* its release if resources have been associated with it using +* v4l2_async_subdev_endpoint_add() or v4l2_subdev_init_finalize(). */ void v4l2_subdev_cleanup (struct v4l2_subdev *sd);
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 28/38 media: adv748x: Return to endpoint matching
In reply to Sakari AilusReturn the two CSI-2 transmitters of adv748x to endpoint matching. This should make the driver work again as expected.
--- drivers/media/i2c/adv748x/adv748x-csi2.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/media/i2c/adv748x/adv748x-csi2.c +9 -3
@@ -296,8 +296,6 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx)if (!is_tx_enabled (tx))return 0 ; -/* FIXME: Do endpoint matching again! */ -adv748x_subdev_init (&tx->sd, state, &adv748x_csi2_ops,MEDIA_ENT_F_VID_IF_BRIDGE ,is_txa (tx) ?"txa" :"txb" );
@@ -313,10 +311,15 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx)if (ret)return ret; - ret =adv748x_csi2_init_controls (tx); + ret =v4l2_async_subdev_endpoint_add (&tx->sd, +of_fwnode_handle (state->endpoints[tx->port]));if (ret) goto err_free_media; + ret =adv748x_csi2_init_controls (tx); +if (ret) + goto err_cleanup_subdev; + ret =v4l2_async_register_subdev (&tx->sd);if (ret) goto err_free_ctrl;
@@ -325,6 +328,8 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx) err_free_ctrl:v4l2_ctrl_handler_free (&tx->ctrl_hdl); +err_cleanup_subdev: +v4l2_subdev_cleanup (&tx->sd); err_free_media:media_entity_cleanup (&tx->sd.entity);
@@ -339,4 +344,5 @@ void adv748x_csi2_cleanup(struct adv748x_csi2 *tx)v4l2_async_unregister_subdev (&tx->sd);media_entity_cleanup (&tx->sd.entity);v4l2_ctrl_handler_free (&tx->ctrl_hdl); +v4l2_subdev_cleanup (&tx->sd); }
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 29/38 media: pxa_camera: Fix probe error handling
In reply to Sakari AilusFix and simplify error handling in pxa_camera probe, by moving devm_*() functions early in the probe function and then tearing down what was set up on error patch.
--- drivers/media/platform/intel/pxa_camera.c | 48 ++++++++++++----------- 1 file changed, 25 insertions(+), 23 deletions(-)
drivers/media/platform/intel/pxa_camera.c +25 -23
@@ -2274,13 +2274,6 @@ static int pxa_camera_probe(struct platform_device *pdev)int irq;int err =0 , i; -/* -* Request the regions. -*/ - base =devm_platform_get_and_ioremap_resource (pdev,0 , &res); -if (IS_ERR (base)) -return PTR_ERR (base); - irq =platform_get_irq (pdev,0 );if (irq <0 )return -ENODEV ;
@@ -2295,6 +2288,16 @@ static int pxa_camera_probe(struct platform_device *pdev)if (IS_ERR (pcdev->clk))return PTR_ERR (pcdev->clk); +/* +* Request the regions. +*/ + base =devm_platform_get_and_ioremap_resource (pdev,0 , &res); +if (IS_ERR (base)) +return PTR_ERR (base); + + pcdev->irq = irq; + pcdev->base = base; +v4l2_async_nf_init (&pcdev->notifier); pcdev->res = res; pcdev->pdata = pdev->dev.platform_data;
@@ -2344,14 +2347,12 @@ static int pxa_camera_probe(struct platform_device *pdev)spin_lock_init (&pcdev->lock);mutex_init (&pcdev->mlock); - pcdev->irq = irq; - pcdev->base = base; -/* request dma */ pcdev->dma_chans[0 ] =dma_request_chan (&pdev->dev,"CI_Y" );if (IS_ERR (pcdev->dma_chans[0 ])) {dev_err (&pdev->dev,"Can't request DMA for Y\n" ); -return PTR_ERR (pcdev->dma_chans[0 ]); + err =PTR_ERR (pcdev->dma_chans[0 ]); + goto exit_notifier_cleanup; } pcdev->dma_chans[1 ] =dma_request_chan (&pdev->dev,"CI_U" );
@@ -2378,14 +2379,6 @@ static int pxa_camera_probe(struct platform_device *pdev) } } -/* request irq */ - err =devm_request_irq (&pdev->dev, pcdev->irq, pxa_camera_irq,0 , -PXA_CAM_DRV_NAME , pcdev); -if (err) { -dev_err (&pdev->dev,"Camera interrupt register failed\n" ); - goto exit_free_dma; - } -tasklet_setup (&pcdev->task_eof, pxa_camera_eof);pxa_camera_activate (pcdev);
@@ -2397,16 +2390,23 @@ static int pxa_camera_probe(struct platform_device *pdev) err =pxa_camera_init_videobuf2 (pcdev);if (err) - goto exit_notifier_cleanup; + goto exit_v4l2_device_unregister; + +/* request irq */ + err =devm_request_irq (&pdev->dev, pcdev->irq, pxa_camera_irq,0 , +PXA_CAM_DRV_NAME , pcdev); +if (err) { +dev_err (&pdev->dev,"Camera interrupt register failed\n" ); + goto exit_v4l2_device_unregister; + } pcdev->notifier.ops = &pxa_camera_sensor_ops; err =v4l2_async_nf_register (&pcdev->v4l2_dev, &pcdev->notifier);if (err) - goto exit_notifier_cleanup; + goto exit_v4l2_device_unregister;return 0 ; -exit_notifier_cleanup: -v4l2_async_nf_cleanup (&pcdev->notifier); +exit_v4l2_device_unregister:v4l2_device_unregister (&pcdev->v4l2_dev); exit_deactivate:pxa_camera_deactivate (pcdev);
@@ -2417,6 +2417,8 @@ static int pxa_camera_probe(struct platform_device *pdev)dma_release_channel (pcdev->dma_chans[1 ]); exit_free_dma_y:dma_release_channel (pcdev->dma_chans[0 ]); +exit_notifier_cleanup: +v4l2_async_nf_cleanup (&pcdev->notifier);return err; }
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 30/38 media: pxa_camera: Register V4L2 device early
In reply to Sakari AilusRegister V4L2 device before initialising the notifier. This way the device can be made available to the V4L2 async framework from the notifier init time onwards. A subsequent patch will add struct v4l2_device as an argument to v4l2_async_nf_init().
--- drivers/media/platform/intel/pxa_camera.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/media/platform/intel/pxa_camera.c +10 -9
@@ -2298,6 +2298,10 @@ static int pxa_camera_probe(struct platform_device *pdev) pcdev->irq = irq; pcdev->base = base; + err =v4l2_device_register (&pdev->dev, &pcdev->v4l2_dev); +if (err) +return err; +v4l2_async_nf_init (&pcdev->notifier); pcdev->res = res; pcdev->pdata = pdev->dev.platform_data;
@@ -2315,10 +2319,10 @@ static int pxa_camera_probe(struct platform_device *pdev) }else if (pdev->dev.of_node) { err =pxa_camera_pdata_from_dt (&pdev->dev, pcdev); }else { -return -ENODEV ; + err = -ENODEV ; }if (err <0 ) -return err; + goto exit_v4l2_device_unregister;if (!(pcdev->platform_flags & (PXA_CAMERA_DATAWIDTH_8 |PXA_CAMERA_DATAWIDTH_9 |PXA_CAMERA_DATAWIDTH_10 ))) {
@@ -2384,13 +2388,10 @@ static int pxa_camera_probe(struct platform_device *pdev)pxa_camera_activate (pcdev);platform_set_drvdata (pdev, pcdev); - err =v4l2_device_register (&pdev->dev, &pcdev->v4l2_dev); -if (err) - goto exit_deactivate; err =pxa_camera_init_videobuf2 (pcdev);if (err) - goto exit_v4l2_device_unregister; + goto exit_deactivate;/* request irq */ err = devm_request_irq(&pdev->dev, pcdev->irq, pxa_camera_irq, 0,
@@ -2403,11 +2404,9 @@ static int pxa_camera_probe(struct platform_device *pdev) pcdev->notifier.ops = &pxa_camera_sensor_ops; err =v4l2_async_nf_register (&pcdev->v4l2_dev, &pcdev->notifier);if (err) - goto exit_v4l2_device_unregister; + goto exit_deactivate;return 0 ; -exit_v4l2_device_unregister: -v4l2_device_unregister (&pcdev->v4l2_dev); exit_deactivate:pxa_camera_deactivate (pcdev);tasklet_kill (&pcdev->task_eof);
@@ -2419,6 +2418,8 @@ static int pxa_camera_probe(struct platform_device *pdev)dma_release_channel (pcdev->dma_chans[0 ]); exit_notifier_cleanup:v4l2_async_nf_cleanup (&pcdev->notifier); +exit_v4l2_device_unregister: +v4l2_device_unregister (&pcdev->v4l2_dev);return err; }
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 31/38 media: marvell: cafe: Register V4L2 device earlier
In reply to Sakari AilusRegister V4L2 device before the async notifier. This way the device can be made available to the V4L2 async framework from the notifier init time onwards. A subsequent patch will add struct v4l2_device as an argument to v4l2_async_nf_init().
--- drivers/media/platform/marvell/cafe-driver.c | 11 +++++++++-- drivers/media/platform/marvell/mcam-core.c | 9 --------- 2 files changed, 9 insertions(+), 11 deletions(-)
drivers/media/platform/marvell/cafe-driver.c +9 -2
@@ -536,6 +536,10 @@ static int cafe_pci_probe(struct pci_dev *pdev,if (ret) goto out_pdown; + ret =v4l2_device_register (mcam->dev, &mcam->v4l2_dev); +if (ret) + goto out_smbus_shutdown; +v4l2_async_nf_init (&mcam->notifier); asd = v4l2_async_nf_add_i2c(&mcam->notifier,
@@ -544,12 +548,12 @@ static int cafe_pci_probe(struct pci_dev *pdev, struct v4l2_async_connection);if (IS_ERR (asd)) { ret =PTR_ERR (asd); - goto out_smbus_shutdown; + goto out_v4l2_device_unregister; } ret =mccic_register (mcam);if (ret) - goto out_smbus_shutdown; + goto out_v4l2_device_unregister;clkdev_create (mcam->mclk,"xclk" ,"%d-%04x" ,i2c_adapter_id (cam->i2c_adapter), ov7670_info.addr);
@@ -565,6 +569,8 @@ static int cafe_pci_probe(struct pci_dev *pdev, out_mccic_shutdown:mccic_shutdown (mcam); +out_v4l2_device_unregister: +v4l2_device_unregister (&mcam->v4l2_dev); out_smbus_shutdown:cafe_smbus_shutdown (cam); out_pdown:
@@ -587,6 +593,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,static void cafe_shutdown (struct cafe_camera *cam) {mccic_shutdown (&cam->mcam); +v4l2_device_unregister (&cam->mcam.v4l2_dev);cafe_smbus_shutdown (cam);free_irq (cam->pdev->irq, cam);pci_iounmap (cam->pdev, cam->mcam.regs);
drivers/media/platform/marvell/mcam-core.c +0 -9
@@ -1863,13 +1863,6 @@ int mccic_register(struct mcam_camera *cam) goto out; } -/* -* Register with V4L -*/ - ret =v4l2_device_register (cam->dev, &cam->v4l2_dev); -if (ret) - goto out; -mutex_init (&cam->s_mutex); cam->state =S_NOTREADY ;mcam_set_config_needed (cam,1 );
@@ -1915,7 +1908,6 @@ int mccic_register(struct mcam_camera *cam) out:v4l2_async_nf_unregister (&cam->notifier); -v4l2_device_unregister (&cam->v4l2_dev);v4l2_async_nf_cleanup (&cam->notifier);return ret; }
@@ -1937,7 +1929,6 @@ void mccic_shutdown(struct mcam_camera *cam)mcam_free_dma_bufs (cam);v4l2_ctrl_handler_free (&cam->ctrl_handler);v4l2_async_nf_unregister (&cam->notifier); -v4l2_device_unregister (&cam->v4l2_dev);v4l2_async_nf_cleanup (&cam->notifier); }EXPORT_SYMBOL_GPL (mccic_shutdown);
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 32/38 media: am437x-vpfe: Register V4L2 device early
In reply to Sakari AilusRegister V4L2 device before the async notifier.This way the device can be made available to the V4L2 async framework from the notifier init time onwards. A subsequent patch will add struct v4l2_device as an argument to v4l2_async_nf_init().
--- .../media/platform/ti/am437x/am437x-vpfe.c | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/media/platform/ti/am437x/am437x-vpfe.c +13 -14
@@ -2403,10 +2403,17 @@ static int vpfe_probe(struct platform_device *pdev) vpfe->pdev = &pdev->dev; + ret =v4l2_device_register (&pdev->dev, &vpfe->v4l2_dev); +if (ret) { +vpfe_err (vpfe,"Unable to register v4l2 device.\n" ); +return ret; + } + vpfe_cfg =vpfe_get_pdata (vpfe);if (!vpfe_cfg) {dev_err (&pdev->dev,"No platform data\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto probe_out_cleanup; } vpfe->cfg = vpfe_cfg;
@@ -2433,13 +2440,6 @@ static int vpfe_probe(struct platform_device *pdev) goto probe_out_cleanup; } - ret =v4l2_device_register (&pdev->dev, &vpfe->v4l2_dev); -if (ret) { -vpfe_err (vpfe, -"Unable to register v4l2 device.\n" ); - goto probe_out_cleanup; - } -/* set the driver data in platform device */ platform_set_drvdata (pdev, vpfe);/* Enabling module functional clock */
@@ -2449,7 +2449,7 @@ static int vpfe_probe(struct platform_device *pdev) ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 ) {vpfe_err (vpfe,"Unable to resume device.\n" ); - goto probe_out_v4l2_unregister; + goto probe_out_cleanup; }vpfe_ccdc_config_defaults (ccdc);
@@ -2462,7 +2462,7 @@ static int vpfe_probe(struct platform_device *pdev) GFP_KERNEL);if (!vpfe->sd) { ret = -ENOMEM ; - goto probe_out_v4l2_unregister; + goto probe_out_cleanup; } vpfe->notifier.ops = &vpfe_async_ops;
@@ -2470,15 +2470,14 @@ static int vpfe_probe(struct platform_device *pdev)if (ret) {vpfe_err (vpfe,"Error registering async notifier\n" ); ret = -EINVAL ; - goto probe_out_v4l2_unregister; + goto probe_out_cleanup; }return 0 ; -probe_out_v4l2_unregister: -v4l2_device_unregister (&vpfe->v4l2_dev); probe_out_cleanup:v4l2_async_nf_cleanup (&vpfe->notifier); +v4l2_device_unregister (&vpfe->v4l2_dev);return ret; }
@@ -2493,8 +2492,8 @@ static void vpfe_remove(struct platform_device *pdev)v4l2_async_nf_unregister (&vpfe->notifier);v4l2_async_nf_cleanup (&vpfe->notifier); -v4l2_device_unregister (&vpfe->v4l2_dev);video_unregister_device (&vpfe->video_dev); +v4l2_device_unregister (&vpfe->v4l2_dev); }#ifdef CONFIG_PM_SLEEP
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 33/38 media: omap3isp: Initialise V4L2 async notifier later
In reply to Sakari AilusInitialise V4L2 async notifier and parse DT for async sub-devices later, just before registering the notifier. This way the device can be made available to the V4L2 async framework from the notifier init time onwards. A subsequent patch will add struct v4l2_device as an argument to v4l2_async_nf_init().
--- drivers/media/platform/ti/omap3isp/isp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/media/platform/ti/omap3isp/isp.c +8 -7
@@ -2002,6 +2002,7 @@ static void isp_remove(struct platform_device *pdev)struct isp_device *isp =platform_get_drvdata (pdev);v4l2_async_nf_unregister (&isp->notifier); +v4l2_async_nf_cleanup (&isp->notifier);isp_unregister_entities (isp);isp_cleanup_modules (isp);isp_xclk_cleanup (isp);
@@ -2011,7 +2012,6 @@ static void isp_remove(struct platform_device *pdev)__omap3isp_put (isp, false);media_entity_enum_cleanup (&isp->crashed); -v4l2_async_nf_cleanup (&isp->notifier);kfree (isp); }
@@ -2288,13 +2288,8 @@ static int isp_probe(struct platform_device *pdev)mutex_init (&isp->isp_mutex);spin_lock_init (&isp->stat_lock); -v4l2_async_nf_init (&isp->notifier); isp->dev = &pdev->dev; - ret =isp_parse_of_endpoints (isp); -if (ret <0 ) - goto error; - isp->ref_count =0 ; ret =dma_coerce_mask_and_coherent (isp->dev,DMA_BIT_MASK (32 ));
@@ -2425,6 +2420,12 @@ static int isp_probe(struct platform_device *pdev) isp->notifier.ops = &isp_subdev_notifier_ops; +v4l2_async_nf_init (&isp->notifier); + + ret =isp_parse_of_endpoints (isp); +if (ret <0 ) + goto error_register_entities; + ret =v4l2_async_nf_register (&isp->v4l2_dev, &isp->notifier);if (ret) goto error_register_entities;
@@ -2435,6 +2436,7 @@ static int isp_probe(struct platform_device *pdev)return 0 ; error_register_entities: +v4l2_async_nf_cleanup (&isp->notifier);isp_unregister_entities (isp); error_modules:isp_cleanup_modules (isp);
@@ -2444,7 +2446,6 @@ static int isp_probe(struct platform_device *pdev)isp_xclk_cleanup (isp);__omap3isp_put (isp, false); error: -v4l2_async_nf_cleanup (&isp->notifier);mutex_destroy (&isp->isp_mutex); error_release_isp:kfree (isp);
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 34/38 media: xilinx-vipp: Init async notifier after registering V4L2 device
In reply to Sakari AilusInitialise the V4L2 async notifier after registering the V4L2 device, just before parsing DT for async sub-devices. This way the device can be made available to the V4L2 async framework from the notifier init time onwards. A subsequent patch will add struct v4l2_device as an argument to v4l2_async_nf_init().
--- drivers/media/platform/xilinx/xilinx-vipp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/xilinx/xilinx-vipp.c +2 -1
@@ -494,6 +494,8 @@ static int xvip_graph_init(struct xvip_composite_device *xdev) goto done; } +v4l2_async_nf_init (&xdev->notifier); +/* Parse the graph to extract a list of subdevice DT nodes. */ ret =xvip_graph_parse (xdev);if (ret <0 ) {
@@ -574,7 +576,6 @@ static int xvip_composite_probe(struct platform_device *pdev) xdev->dev = &pdev->dev;INIT_LIST_HEAD (&xdev->dmas); -v4l2_async_nf_init (&xdev->notifier); ret =xvip_composite_v4l2_init (xdev);if (ret <0 )
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 35/38 media: davinci: Init async notifier after registering V4L2 device
In reply to Sakari AilusInitialise the V4L2 async notifier after registering the V4L2 device, just before parsing DT for async sub-devices. This way the device can be made available to the V4L2 async framework from the notifier init time onwards. A subsequent patch will add struct v4l2_device as an argument to v4l2_async_nf_init().
--- .../media/platform/ti/davinci/vpif_capture.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/media/platform/ti/davinci/vpif_capture.c +9 -10
@@ -1608,18 +1608,12 @@ static __init int vpif_probe(struct platform_device *pdev)int res_idx =0 ;int i, err; - pdev->dev.platform_data =vpif_capture_get_pdata (pdev); -if (!pdev->dev.platform_data) { -dev_warn (&pdev->dev,"Missing platform data. Giving up.\n" ); -return -EINVAL ; - } - vpif_dev = &pdev->dev; err =initialize_vpif ();if (err) {v4l2_err (vpif_dev->driver,"Error initializing vpif\n" ); - goto cleanup; +return err; } err =v4l2_device_register (vpif_dev, &vpif_obj.v4l2_dev);
@@ -1646,13 +1640,19 @@ static __init int vpif_probe(struct platform_device *pdev) goto vpif_unregister; }while (++res_idx); + pdev->dev.platform_data =vpif_capture_get_pdata (pdev); +if (!pdev->dev.platform_data) { +dev_warn (&pdev->dev,"Missing platform data. Giving up.\n" ); + goto vpif_unregister; + } + vpif_obj.config = pdev->dev.platform_data; subdev_count = vpif_obj.config->subdev_count; vpif_obj.sd =kcalloc (subdev_count,sizeof (*vpif_obj.sd),GFP_KERNEL );if (!vpif_obj.sd) { err = -ENOMEM ; - goto vpif_unregister; + goto probe_subdev_out; }if (!vpif_obj.config->asd_sizes[0 ]) {
@@ -1695,14 +1695,13 @@ static __init int vpif_probe(struct platform_device *pdev)return 0 ; probe_subdev_out: +v4l2_async_nf_cleanup (&vpif_obj.notifier);/* free sub devices memory */ kfree (vpif_obj.sd); vpif_unregister:v4l2_device_unregister (&vpif_obj.v4l2_dev); vpif_free:free_vpif_objs (); -cleanup: -v4l2_async_nf_cleanup (&vpif_obj.notifier);return err; }
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 36/38 media: qcom: Initialise V4L2 async notifier later
In reply to Sakari AilusInitialise V4L2 async notifier and parse DT for async sub-devices later, just before registering the notifier. This way the device can be made available to the V4L2 async framework from the notifier init time onwards. A subsequent patch will add struct v4l2_device as an argument to v4l2_async_nf_init().
--- drivers/media/platform/qcom/camss/camss.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/media/platform/qcom/camss/camss.c +10 -11
@@ -1615,14 +1615,6 @@ static int camss_probe(struct platform_device *pdev)if (!camss->vfe)return -ENOMEM ; -v4l2_async_nf_init (&camss->notifier); - - num_subdevs =camss_of_parse_ports (camss); -if (num_subdevs <0 ) { - ret = num_subdevs; - goto err_cleanup; - } - ret =camss_icc_get (camss);if (ret <0 ) goto err_cleanup;
@@ -1648,9 +1640,17 @@ static int camss_probe(struct platform_device *pdev) goto err_cleanup; } +v4l2_async_nf_init (&camss->notifier); + + num_subdevs =camss_of_parse_ports (camss); +if (num_subdevs <0 ) { + ret = num_subdevs; + goto err_cleanup; + } + ret =camss_register_entities (camss);if (ret <0 ) - goto err_register_entities; + goto err_cleanup;if (num_subdevs) { camss->notifier.ops = &camss_subdev_notifier_ops;
@@ -1691,9 +1691,8 @@ static int camss_probe(struct platform_device *pdev) err_register_subdevs:camss_unregister_entities (camss); -err_register_entities: -v4l2_device_unregister (&camss->v4l2_dev); err_cleanup: +v4l2_device_unregister (&camss->v4l2_dev);v4l2_async_nf_cleanup (&camss->notifier);return ret;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 37/38 media: v4l: async: Set v4l2_device and subdev in async notifier init
In reply to Sakari AilusSet the v4l2_device already in async notifier init, so struct device related to it will be available before the notifier is registered. This requires separating notifier initialisation into two functions, one that takes v4l2_device as its argument, v4l2_async_nf_init and v4l2_async_subdev_nf_init, for sub-device notifiers. Registering the notifier will use a single function, v4l2_async_nf_register.
This is done in order to make struct device available earlier, during construction of the async connections, for sensible debug prints.
--- drivers/media/i2c/ds90ub913.c | 4 +- drivers/media/i2c/ds90ub953.c | 4 +- drivers/media/i2c/ds90ub960.c | 4 +- drivers/media/i2c/max9286.c | 4 +- drivers/media/i2c/st-mipid02.c | 4 +- drivers/media/i2c/tc358746.c | 4 +- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 4 +- drivers/media/platform/atmel/atmel-isi.c | 4 +- drivers/media/platform/cadence/cdns-csi2rx.c | 4 +- drivers/media/platform/intel/pxa_camera.c | 4 +- drivers/media/platform/marvell/cafe-driver.c | 2 +- drivers/media/platform/marvell/mcam-core.c | 2 +- drivers/media/platform/marvell/mmp-driver.c | 2 +- .../platform/microchip/microchip-csi2dc.c | 5 +-- .../microchip/microchip-sama5d2-isc.c | 5 +-- .../microchip/microchip-sama7g5-isc.c | 5 +-- drivers/media/platform/nxp/imx-mipi-csis.c | 4 +- drivers/media/platform/nxp/imx7-media-csi.c | 4 +- .../platform/nxp/imx8-isi/imx8-isi-core.c | 4 +- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 4 +- drivers/media/platform/qcom/camss/camss.c | 5 +-- drivers/media/platform/renesas/rcar-isp.c | 4 +- .../platform/renesas/rcar-vin/rcar-core.c | 8 ++-- .../platform/renesas/rcar-vin/rcar-csi2.c | 4 +- drivers/media/platform/renesas/rcar_drif.c | 4 +- drivers/media/platform/renesas/renesas-ceu.c | 4 +- .../platform/renesas/rzg2l-cru/rzg2l-core.c | 4 +- .../platform/renesas/rzg2l-cru/rzg2l-csi2.c | 4 +- .../platform/rockchip/rkisp1/rkisp1-dev.c | 4 +- .../platform/samsung/exynos4-is/media-dev.c | 5 +-- drivers/media/platform/st/stm32/stm32-dcmi.c | 4 +- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 4 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 10 ++--- .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 4 +- .../sun8i_a83t_mipi_csi2.c | 4 +- .../media/platform/ti/am437x/am437x-vpfe.c | 4 +- drivers/media/platform/ti/cal/cal.c | 4 +- .../media/platform/ti/davinci/vpif_capture.c | 11 ++--- drivers/media/platform/ti/omap3isp/isp.c | 4 +- drivers/media/platform/video-mux.c | 4 +- drivers/media/platform/xilinx/xilinx-vipp.c | 4 +- drivers/media/v4l2-core/v4l2-async.c | 44 +++++++------------ drivers/media/v4l2-core/v4l2-fwnode.c | 4 +- .../media/atomisp/pci/atomisp_csi2_bridge.c | 2 +- .../staging/media/atomisp/pci/atomisp_v4l2.c | 2 +- .../deprecated/atmel/atmel-sama5d2-isc.c | 5 +-- .../deprecated/atmel/atmel-sama7g5-isc.c | 5 +-- drivers/staging/media/imx/imx-media-csi.c | 4 +- .../staging/media/imx/imx-media-dev-common.c | 4 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 4 +- .../media/sunxi/sun6i-isp/sun6i_isp_proc.c | 4 +- drivers/staging/media/tegra-video/vi.c | 5 +-- include/media/v4l2-async.h | 33 ++++++++------ 53 files changed, 142 insertions(+), 154 deletions(-)
drivers/media/i2c/ds90ub913.c +2 -2
@@ -568,7 +568,7 @@ static int ub913_v4l2_notifier_register(struct ub913_data *priv)return -ENODEV ; } -v4l2_async_nf_init (&priv->notifier); +v4l2_async_subdev_nf_init (&priv->notifier, &priv->sd); asd =v4l2_async_nf_add_fwnode_remote (&priv->notifier, ep_fwnode, struct v4l2_async_connection);
@@ -583,7 +583,7 @@ static int ub913_v4l2_notifier_register(struct ub913_data *priv) priv->notifier.ops = &ub913_notify_ops; - ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier); + ret =v4l2_async_nf_register (&priv->notifier);if (ret) {dev_err (dev,"Failed to register subdev_notifier" );v4l2_async_nf_cleanup (&priv->notifier);
drivers/media/i2c/ds90ub953.c +2 -2
@@ -773,7 +773,7 @@ static int ub953_v4l2_notifier_register(struct ub953_data *priv)return -ENODEV ; } -v4l2_async_nf_init (&priv->notifier); +v4l2_async_subdev_nf_init (&priv->notifier, &priv->sd); asd =v4l2_async_nf_add_fwnode_remote (&priv->notifier, ep_fwnode, struct v4l2_async_connection);
@@ -788,7 +788,7 @@ static int ub953_v4l2_notifier_register(struct ub953_data *priv) priv->notifier.ops = &ub953_notify_ops; - ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier); + ret =v4l2_async_nf_register (&priv->notifier);if (ret) {dev_err (dev,"Failed to register subdev_notifier" );v4l2_async_nf_cleanup (&priv->notifier);
drivers/media/i2c/ds90ub960.c +2 -2
@@ -3599,7 +3599,7 @@ static int ub960_v4l2_notifier_register(struct ub960_data *priv)unsigned int i;int ret; -v4l2_async_nf_init (&priv->notifier); +v4l2_async_subdev_nf_init (&priv->notifier, &priv->sd);for (i =0 ; i < priv->hw_data->num_rxports; i++) {struct ub960_rxport *rxport = priv->rxports[i];
@@ -3623,7 +3623,7 @@ static int ub960_v4l2_notifier_register(struct ub960_data *priv) priv->notifier.ops = &ub960_notify_ops; - ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier); + ret =v4l2_async_nf_register (&priv->notifier);if (ret) {dev_err (dev,"Failed to register subdev_notifier" );v4l2_async_nf_cleanup (&priv->notifier);
drivers/media/i2c/max9286.c +2 -2
@@ -746,7 +746,7 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv)if (!priv->nsources)return 0 ; -v4l2_async_nf_init (&priv->notifier); +v4l2_async_subdev_nf_init (&priv->notifier, &priv->sd);for_each_source (priv, source) {unsigned int i =to_index (priv, source);
@@ -766,7 +766,7 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv) priv->notifier.ops = &max9286_notify_ops; - ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier); + ret =v4l2_async_nf_register (&priv->notifier);if (ret) {dev_err (dev,"Failed to register subdev_notifier" );v4l2_async_nf_cleanup (&priv->notifier);
drivers/media/i2c/st-mipid02.c +2 -2
@@ -911,7 +911,7 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) bridge->rx = ep;/* register async notifier so we get noticed when sensor is connected */ -v4l2_async_nf_init (&bridge->notifier); +v4l2_async_subdev_nf_init (&bridge->notifier, &bridge->sd); asd =v4l2_async_nf_add_fwnode_remote (&bridge->notifier,of_fwnode_handle (ep_node), struct v4l2_async_connection);
@@ -924,7 +924,7 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) } bridge->notifier.ops = &mipid02_notifier_ops; - ret =v4l2_async_subdev_nf_register (&bridge->sd, &bridge->notifier); + ret =v4l2_async_nf_register (&bridge->notifier);if (ret)v4l2_async_nf_cleanup (&bridge->notifier);
drivers/media/i2c/tc358746.c +2 -2
@@ -1460,7 +1460,7 @@ static int tc358746_async_register(struct tc358746 *tc358746)return err; } -v4l2_async_nf_init (&tc358746->notifier); +v4l2_async_subdev_nf_init (&tc358746->notifier, &tc358746->sd); asd =v4l2_async_nf_add_fwnode_remote (&tc358746->notifier, ep, struct v4l2_async_connection);fwnode_handle_put (ep);
@@ -1472,7 +1472,7 @@ static int tc358746_async_register(struct tc358746 *tc358746) tc358746->notifier.ops = &tc358746_notify_ops; - err =v4l2_async_subdev_nf_register (&tc358746->sd, &tc358746->notifier); + err =v4l2_async_nf_register (&tc358746->notifier);if (err) goto err_cleanup;
drivers/media/pci/intel/ipu3/ipu3-cio2.c +2 -2
@@ -1500,7 +1500,7 @@ static int cio2_parse_firmware(struct cio2_device *cio2)* suspend. */ cio2->notifier.ops = &cio2_async_ops; - ret =v4l2_async_nf_register (&cio2->v4l2_dev, &cio2->notifier); + ret =v4l2_async_nf_register (&cio2->notifier);if (ret)dev_err (dev,"failed to register async notifier : %d\n" , ret);
@@ -1795,7 +1795,7 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,if (r) goto fail_v4l2_device_unregister; -v4l2_async_nf_init (&cio2->notifier); +v4l2_async_nf_init (&cio2->notifier, &cio2->v4l2_dev);/* Register notifier for subdevices we care */ r =cio2_parse_firmware (cio2);
drivers/media/platform/atmel/atmel-isi.c +2 -2
@@ -1159,7 +1159,7 @@ static int isi_graph_init(struct atmel_isi *isi)if (!ep)return -EINVAL ; -v4l2_async_nf_init (&isi->notifier); +v4l2_async_nf_init (&isi->notifier, &isi->v4l2_dev); asd = v4l2_async_nf_add_fwnode_remote(&isi->notifier, of_fwnode_handle(ep),
@@ -1171,7 +1171,7 @@ static int isi_graph_init(struct atmel_isi *isi) isi->notifier.ops = &isi_graph_notify_ops; - ret =v4l2_async_nf_register (&isi->v4l2_dev, &isi->notifier); + ret =v4l2_async_nf_register (&isi->notifier);if (ret <0 ) {dev_err (isi->dev,"Notifier registration failed\n" );v4l2_async_nf_cleanup (&isi->notifier);
drivers/media/platform/cadence/cdns-csi2rx.c +2 -2
@@ -474,7 +474,7 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)return -EINVAL ; } -v4l2_async_nf_init (&csi2rx->notifier); +v4l2_async_subdev_nf_init (&csi2rx->notifier, &csi2rx->subdev); asd =v4l2_async_nf_add_fwnode_remote (&csi2rx->notifier, fwh, struct v4l2_async_connection);
@@ -484,7 +484,7 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx) csi2rx->notifier.ops = &csi2rx_notifier_ops; - ret =v4l2_async_subdev_nf_register (&csi2rx->subdev, &csi2rx->notifier); + ret =v4l2_async_nf_register (&csi2rx->notifier);if (ret)v4l2_async_nf_cleanup (&csi2rx->notifier);
drivers/media/platform/intel/pxa_camera.c +2 -2
@@ -2302,7 +2302,7 @@ static int pxa_camera_probe(struct platform_device *pdev)if (err)return err; -v4l2_async_nf_init (&pcdev->notifier); +v4l2_async_nf_init (&pcdev->notifier, &pcdev->v4l2_dev); pcdev->res = res; pcdev->pdata = pdev->dev.platform_data;if (pcdev->pdata) {
@@ -2402,7 +2402,7 @@ static int pxa_camera_probe(struct platform_device *pdev) } pcdev->notifier.ops = &pxa_camera_sensor_ops; - err =v4l2_async_nf_register (&pcdev->v4l2_dev, &pcdev->notifier); + err =v4l2_async_nf_register (&pcdev->notifier);if (err) goto exit_deactivate;
drivers/media/platform/marvell/cafe-driver.c +1 -1
@@ -540,7 +540,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,if (ret) goto out_smbus_shutdown; -v4l2_async_nf_init (&mcam->notifier); +v4l2_async_nf_init (&mcam->notifier, &mcam->v4l2_dev); asd = v4l2_async_nf_add_i2c(&mcam->notifier, i2c_adapter_id(cam->i2c_adapter),
drivers/media/platform/marvell/mcam-core.c +1 -1
@@ -1870,7 +1870,7 @@ int mccic_register(struct mcam_camera *cam) cam->mbus_code = mcam_def_mbus_code; cam->notifier.ops = &mccic_notify_ops; - ret =v4l2_async_nf_register (&cam->v4l2_dev, &cam->notifier); + ret =v4l2_async_nf_register (&cam->notifier);if (ret <0 ) {cam_warn (cam,"failed to register a sensor notifier" ); goto out;
drivers/media/platform/marvell/mmp-driver.c +1 -1
@@ -238,7 +238,7 @@ static int mmpcam_probe(struct platform_device *pdev)if (!ep)return -ENODEV ; -v4l2_async_nf_init (&mcam->notifier); +v4l2_async_nf_init (&mcam->notifier, &mcam->v4l2_dev); asd =v4l2_async_nf_add_fwnode_remote (&mcam->notifier, ep, struct v4l2_async_connection);
drivers/media/platform/microchip/microchip-csi2dc.c +2 -3
@@ -523,7 +523,7 @@ static int csi2dc_prepare_notifier(struct csi2dc_device *csi2dc,struct v4l2_async_connection *asd;int ret =0 ; -v4l2_async_nf_init (&csi2dc->notifier); +v4l2_async_subdev_nf_init (&csi2dc->notifier, &csi2dc->csi2dc_sd); asd = v4l2_async_nf_add_fwnode_remote(&csi2dc->notifier, input_fwnode,
@@ -542,8 +542,7 @@ static int csi2dc_prepare_notifier(struct csi2dc_device *csi2dc, csi2dc->notifier.ops = &csi2dc_async_ops; - ret =v4l2_async_subdev_nf_register (&csi2dc->csi2dc_sd, - &csi2dc->notifier); + ret =v4l2_async_nf_register (&csi2dc->notifier);if (ret) {dev_err (csi2dc->dev,"fail to register async notifier: %d\n" , ret);
drivers/media/platform/microchip/microchip-sama5d2-isc.c +2 -3
@@ -527,7 +527,7 @@ static int microchip_isc_probe(struct platform_device *pdev)struct fwnode_handle *fwnode =of_fwnode_handle (subdev_entity->epn); -v4l2_async_nf_init (&subdev_entity->notifier); +v4l2_async_nf_init (&subdev_entity->notifier, &isc->v4l2_dev); asd = v4l2_async_nf_add_fwnode_remote(&subdev_entity->notifier, fwnode,
@@ -543,8 +543,7 @@ static int microchip_isc_probe(struct platform_device *pdev) subdev_entity->notifier.ops = µchip_isc_async_ops; - ret =v4l2_async_nf_register (&isc->v4l2_dev, - &subdev_entity->notifier); + ret =v4l2_async_nf_register (&subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); goto cleanup_subdev;
drivers/media/platform/microchip/microchip-sama7g5-isc.c +2 -3
@@ -517,7 +517,7 @@ static int microchip_xisc_probe(struct platform_device *pdev)struct fwnode_handle *fwnode =of_fwnode_handle (subdev_entity->epn); -v4l2_async_nf_init (&subdev_entity->notifier); +v4l2_async_nf_init (&subdev_entity->notifier, &isc->v4l2_dev); asd = v4l2_async_nf_add_fwnode_remote(&subdev_entity->notifier, fwnode,
@@ -533,8 +533,7 @@ static int microchip_xisc_probe(struct platform_device *pdev) subdev_entity->notifier.ops = µchip_isc_async_ops; - ret =v4l2_async_nf_register (&isc->v4l2_dev, - &subdev_entity->notifier); + ret =v4l2_async_nf_register (&subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); goto cleanup_subdev;
drivers/media/platform/nxp/imx-mipi-csis.c +2 -2
@@ -1251,7 +1251,7 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis)unsigned int i;int ret; -v4l2_async_nf_init (&csis->notifier); +v4l2_async_subdev_nf_init (&csis->notifier, &csis->sd); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csis->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -1287,7 +1287,7 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) csis->notifier.ops = &mipi_csis_notify_ops; - ret =v4l2_async_subdev_nf_register (&csis->sd, &csis->notifier); + ret =v4l2_async_nf_register (&csis->notifier);if (ret)return ret;
drivers/media/platform/nxp/imx7-media-csi.c +2 -2
@@ -2061,7 +2061,7 @@ static int imx7_csi_async_register(struct imx7_csi *csi)struct fwnode_handle *ep;int ret; -v4l2_async_nf_init (&csi->notifier); +v4l2_async_nf_init (&csi->notifier, &csi->v4l2_dev); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -2084,7 +2084,7 @@ static int imx7_csi_async_register(struct imx7_csi *csi) csi->notifier.ops = &imx7_csi_notify_ops; - ret =v4l2_async_nf_register (&csi->v4l2_dev, &csi->notifier); + ret =v4l2_async_nf_register (&csi->notifier);if (ret) goto error;
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +2 -2
@@ -175,7 +175,7 @@ static int mxc_isi_v4l2_init(struct mxc_isi_dev *isi) }/* Initialize, fill and register the async notifier. */ -v4l2_async_nf_init (&isi->notifier); +v4l2_async_nf_init (&isi->notifier, v4l2_dev); isi->notifier.ops = &mxc_isi_async_notifier_ops;for (i =0 ; i < isi->pdata->num_ports; ++i) {
@@ -200,7 +200,7 @@ static int mxc_isi_v4l2_init(struct mxc_isi_dev *isi) masd->port = i; } - ret =v4l2_async_nf_register (v4l2_dev, &isi->notifier); + ret =v4l2_async_nf_register (&isi->notifier);if (ret <0 ) {dev_err (isi->dev,"Failed to register async notifier: %d\n" , ret);
drivers/media/platform/nxp/imx8mq-mipi-csi2.c +2 -2
@@ -592,7 +592,7 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state)unsigned int i;int ret; -v4l2_async_nf_init (&state->notifier); +v4l2_async_subdev_nf_init (&state->notifier, &state->sd); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (state->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -629,7 +629,7 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) state->notifier.ops = &imx8mq_mipi_csi_notify_ops; - ret =v4l2_async_subdev_nf_register (&state->sd, &state->notifier); + ret =v4l2_async_nf_register (&state->notifier);if (ret)return ret;
drivers/media/platform/qcom/camss/camss.c +2 -3
@@ -1640,7 +1640,7 @@ static int camss_probe(struct platform_device *pdev) goto err_cleanup; } -v4l2_async_nf_init (&camss->notifier); +v4l2_async_nf_init (&camss->notifier, &camss->v4l2_dev); num_subdevs =camss_of_parse_ports (camss);if (num_subdevs <0 ) {
@@ -1655,8 +1655,7 @@ static int camss_probe(struct platform_device *pdev)if (num_subdevs) { camss->notifier.ops = &camss_subdev_notifier_ops; - ret =v4l2_async_nf_register (&camss->v4l2_dev, - &camss->notifier); + ret =v4l2_async_nf_register (&camss->notifier);if (ret) { dev_err(dev, "Failed to register async subdev nodes: %d\n",
drivers/media/platform/renesas/rcar-isp.c +2 -2
@@ -392,7 +392,7 @@ static int risp_parse_dt(struct rcar_isp *isp)dev_dbg (isp->dev,"Found '%pOF'\n" ,to_of_node (fwnode)); -v4l2_async_nf_init (&isp->notifier); +v4l2_async_subdev_nf_init (&isp->notifier, &isp->subdev); isp->notifier.ops = &risp_notify_ops; asd = v4l2_async_nf_add_fwnode(&isp->notifier, fwnode,
@@ -401,7 +401,7 @@ static int risp_parse_dt(struct rcar_isp *isp)if (IS_ERR (asd))return PTR_ERR (asd); - ret =v4l2_async_subdev_nf_register (&isp->subdev, &isp->notifier); + ret =v4l2_async_nf_register (&isp->notifier);if (ret)v4l2_async_nf_cleanup (&isp->notifier);
drivers/media/platform/renesas/rcar-vin/rcar-core.c +4 -4
@@ -375,7 +375,7 @@ static int rvin_group_notifier_init(struct rvin_dev *vin, unsigned int port,mutex_unlock (&vin->group->lock); -v4l2_async_nf_init (&vin->group->notifier); +v4l2_async_nf_init (&vin->group->notifier, &vin->v4l2_dev);/* * Some subdevices may overlap but the parser function can handle it and
@@ -399,7 +399,7 @@ static int rvin_group_notifier_init(struct rvin_dev *vin, unsigned int port,return 0 ; vin->group->notifier.ops = &rvin_group_notify_ops; - ret =v4l2_async_nf_register (&vin->v4l2_dev, &vin->group->notifier); + ret =v4l2_async_nf_register (&vin->group->notifier);if (ret <0 ) {vin_err (vin,"Notifier registration failed\n" );v4l2_async_nf_cleanup (&vin->group->notifier);
@@ -712,7 +712,7 @@ static int rvin_parallel_init(struct rvin_dev *vin) {int ret; -v4l2_async_nf_init (&vin->notifier); +v4l2_async_nf_init (&vin->notifier, &vin->v4l2_dev); ret =rvin_parallel_parse_of (vin);if (ret)
@@ -725,7 +725,7 @@ static int rvin_parallel_init(struct rvin_dev *vin) to_of_node(vin->parallel.asc->match.fwnode)); vin->notifier.ops = &rvin_parallel_notify_ops; - ret =v4l2_async_nf_register (&vin->v4l2_dev, &vin->notifier); + ret =v4l2_async_nf_register (&vin->notifier);if (ret <0 ) {vin_err (vin,"Notifier registration failed\n" );v4l2_async_nf_cleanup (&vin->notifier);
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +2 -2
@@ -1122,7 +1122,7 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)dev_dbg (priv->dev,"Found '%pOF'\n" ,to_of_node (fwnode)); -v4l2_async_nf_init (&priv->notifier); +v4l2_async_subdev_nf_init (&priv->notifier, &priv->subdev); priv->notifier.ops = &rcar_csi2_notify_ops; asc = v4l2_async_nf_add_fwnode(&priv->notifier, fwnode,
@@ -1131,7 +1131,7 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)if (IS_ERR (asc))return PTR_ERR (asc); - ret =v4l2_async_subdev_nf_register (&priv->subdev, &priv->notifier); + ret =v4l2_async_nf_register (&priv->notifier);if (ret)v4l2_async_nf_cleanup (&priv->notifier);
drivers/media/platform/renesas/rcar_drif.c +2 -2
@@ -1208,7 +1208,7 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)struct fwnode_handle *fwnode, *ep;struct v4l2_async_connection *asd; -v4l2_async_nf_init (notifier); +v4l2_async_nf_init (&sdr->notifier, &sdr->v4l2_dev); ep =fwnode_graph_get_next_endpoint (of_fwnode_handle (sdr->dev->of_node),NULL );
@@ -1342,7 +1342,7 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr) sdr->notifier.ops = &rcar_drif_notify_ops;/* Register notifier */ - ret =v4l2_async_nf_register (&sdr->v4l2_dev, &sdr->notifier); + ret =v4l2_async_nf_register (&sdr->notifier);if (ret <0 ) {dev_err (sdr->dev,"failed: notifier register ret %d\n" , ret); goto cleanup;
drivers/media/platform/renesas/renesas-ceu.c +2 -2
@@ -1657,7 +1657,7 @@ static int ceu_probe(struct platform_device *pdev)if (ret) goto error_pm_disable; -v4l2_async_nf_init (&ceudev->notifier); +v4l2_async_nf_init (&ceudev->notifier, &ceudev->v4l2_dev);if (IS_ENABLED (CONFIG_OF ) && dev->of_node) { ceu_data =of_device_get_match_data (dev);
@@ -1679,7 +1679,7 @@ static int ceu_probe(struct platform_device *pdev) ceudev->notifier.v4l2_dev = &ceudev->v4l2_dev; ceudev->notifier.ops = &ceu_notify_ops; - ret =v4l2_async_nf_register (&ceudev->v4l2_dev, &ceudev->notifier); + ret =v4l2_async_nf_register (&ceudev->notifier);if (ret) goto error_cleanup;
drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +2 -2
@@ -182,7 +182,7 @@ static int rzg2l_cru_mc_parse_of_graph(struct rzg2l_cru_dev *cru) {int ret; -v4l2_async_nf_init (&cru->notifier); +v4l2_async_nf_init (&cru->notifier, &cru->v4l2_dev); ret =rzg2l_cru_mc_parse_of (cru);if (ret)
@@ -193,7 +193,7 @@ static int rzg2l_cru_mc_parse_of_graph(struct rzg2l_cru_dev *cru)if (list_empty (&cru->notifier.waiting_list))return 0 ; - ret =v4l2_async_nf_register (&cru->v4l2_dev, &cru->notifier); + ret =v4l2_async_nf_register (&cru->notifier);if (ret <0 ) {dev_err (cru->dev,"Notifier registration failed\n" );v4l2_async_nf_cleanup (&cru->notifier);
drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c +2 -2
@@ -673,7 +673,7 @@ static int rzg2l_csi2_parse_dt(struct rzg2l_csi2 *csi2) fwnode =fwnode_graph_get_remote_endpoint (ep);fwnode_handle_put (ep); -v4l2_async_nf_init (&csi2->notifier); +v4l2_async_subdev_nf_init (&csi2->notifier, &csi2->subdev); csi2->notifier.ops = &rzg2l_csi2_notify_ops; asd = v4l2_async_nf_add_fwnode(&csi2->notifier, fwnode,
@@ -682,7 +682,7 @@ static int rzg2l_csi2_parse_dt(struct rzg2l_csi2 *csi2)if (IS_ERR (asd))return PTR_ERR (asd); - ret =v4l2_async_subdev_nf_register (&csi2->subdev, &csi2->notifier); + ret =v4l2_async_nf_register (&csi2->notifier);if (ret)v4l2_async_nf_cleanup (&csi2->notifier);
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +2 -2
@@ -187,7 +187,7 @@ static int rkisp1_subdev_notifier_register(struct rkisp1_device *rkisp1)unsigned int index =0 ;int ret =0 ; -v4l2_async_nf_init (ntf); +v4l2_async_nf_init (ntf, &rkisp1->v4l2_dev); ntf->ops = &rkisp1_subdev_notifier_ops;
@@ -287,7 +287,7 @@ static int rkisp1_subdev_notifier_register(struct rkisp1_device *rkisp1)if (!index)dev_dbg (rkisp1->dev,"no remote subdevice found\n" ); - ret =v4l2_async_nf_register (&rkisp1->v4l2_dev, ntf); + ret =v4l2_async_nf_register (ntf);if (ret) {v4l2_async_nf_cleanup (ntf);return ret;
drivers/media/platform/samsung/exynos4-is/media-dev.c +2 -3
@@ -1478,7 +1478,7 @@ static int fimc_md_probe(struct platform_device *pdev)platform_set_drvdata (pdev, fmd); -v4l2_async_nf_init (&fmd->subdev_notifier); +v4l2_async_nf_init (&fmd->subdev_notifier, &fmd->v4l2_dev); ret =fimc_md_register_platform_entities (fmd, dev->of_node);if (ret)
@@ -1506,8 +1506,7 @@ static int fimc_md_probe(struct platform_device *pdev) fmd->subdev_notifier.ops = &subdev_notifier_ops; fmd->num_sensors =0 ; - ret =v4l2_async_nf_register (&fmd->v4l2_dev, - &fmd->subdev_notifier); + ret =v4l2_async_nf_register (&fmd->subdev_notifier);if (ret) goto err_clk_p; }
drivers/media/platform/st/stm32/stm32-dcmi.c +2 -2
@@ -1897,7 +1897,7 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi)return -EINVAL ; } -v4l2_async_nf_init (&dcmi->notifier); +v4l2_async_nf_init (&dcmi->notifier, &dcmi->v4l2_dev); asd = v4l2_async_nf_add_fwnode_remote(&dcmi->notifier, of_fwnode_handle(ep),
@@ -1912,7 +1912,7 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi) dcmi->notifier.ops = &dcmi_graph_notify_ops; - ret =v4l2_async_nf_register (&dcmi->v4l2_dev, &dcmi->notifier); + ret =v4l2_async_nf_register (&dcmi->notifier);if (ret <0 ) {dev_err (dcmi->dev,"Failed to register notifier\n" );v4l2_async_nf_cleanup (&dcmi->notifier);
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +2 -2
@@ -121,7 +121,7 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi)struct fwnode_handle *ep;int ret; -v4l2_async_nf_init (&csi->notifier); +v4l2_async_nf_init (&csi->notifier, &csi->v4l); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -239,7 +239,7 @@ static int sun4i_csi_probe(struct platform_device *pdev)if (ret) goto err_unregister_media; - ret =v4l2_async_nf_register (&csi->v4l, &csi->notifier); + ret =v4l2_async_nf_register (&csi->notifier);if (ret) {dev_err (csi->dev,"Couldn't register our notifier.\n" ); goto err_unregister_media;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +5 -5
@@ -819,7 +819,10 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)/* V4L2 Async */ -v4l2_async_nf_init (notifier); +if (csi_dev->isp_available) +v4l2_async_subdev_nf_init (notifier, subdev); +else +v4l2_async_nf_init (notifier, v4l2_dev); notifier->ops = &sun6i_csi_bridge_notifier_ops; sun6i_csi_bridge_source_setup(csi_dev, &bridge->source_parallel,
@@ -828,10 +831,7 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)sun6i_csi_bridge_source_setup (csi_dev, &bridge->source_mipi_csi2,SUN6I_CSI_PORT_MIPI_CSI2 ,NULL ); -if (csi_dev->isp_available) - ret =v4l2_async_subdev_nf_register (subdev, notifier); -else - ret =v4l2_async_nf_register (v4l2_dev, notifier); + ret =v4l2_async_nf_register (notifier);if (ret) {dev_err (dev,"failed to register v4l2 async notifier: %d\n" , ret);
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c +2 -2
@@ -530,7 +530,7 @@ static int sun6i_mipi_csi2_bridge_setup(struct sun6i_mipi_csi2_device *csi2_dev)/* V4L2 Async */ -v4l2_async_nf_init (notifier); +v4l2_async_subdev_nf_init (notifier, subdev); notifier->ops = &sun6i_mipi_csi2_notifier_ops; ret =sun6i_mipi_csi2_bridge_source_setup (csi2_dev);
@@ -539,7 +539,7 @@ static int sun6i_mipi_csi2_bridge_setup(struct sun6i_mipi_csi2_device *csi2_dev)/* Only register the notifier when a sensor is connected. */ if (ret != -ENODEV ) { - ret =v4l2_async_subdev_nf_register (subdev, notifier); + ret =v4l2_async_nf_register (notifier);if (ret <0 ) goto error_v4l2_notifier_cleanup;
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +2 -2
@@ -568,7 +568,7 @@ sun8i_a83t_mipi_csi2_bridge_setup(struct sun8i_a83t_mipi_csi2_device *csi2_dev)/* V4L2 Async */ -v4l2_async_nf_init (notifier); +v4l2_async_subdev_nf_init (notifier, subdev); notifier->ops = &sun8i_a83t_mipi_csi2_notifier_ops; ret =sun8i_a83t_mipi_csi2_bridge_source_setup (csi2_dev);
@@ -577,7 +577,7 @@ sun8i_a83t_mipi_csi2_bridge_setup(struct sun8i_a83t_mipi_csi2_device *csi2_dev)/* Only register the notifier when a sensor is connected. */ if (ret != -ENODEV ) { - ret =v4l2_async_subdev_nf_register (subdev, notifier); + ret =v4l2_async_nf_register (notifier);if (ret <0 ) goto error_v4l2_notifier_cleanup;
drivers/media/platform/ti/am437x/am437x-vpfe.c +2 -2
@@ -2300,7 +2300,7 @@ vpfe_get_pdata(struct vpfe_device *vpfe)dev_dbg (dev,"vpfe_get_pdata\n" ); -v4l2_async_nf_init (&vpfe->notifier); +v4l2_async_nf_init (&vpfe->notifier, &vpfe->v4l2_dev);if (!IS_ENABLED (CONFIG_OF ) || !dev->of_node)return dev->platform_data;
@@ -2466,7 +2466,7 @@ static int vpfe_probe(struct platform_device *pdev) } vpfe->notifier.ops = &vpfe_async_ops; - ret =v4l2_async_nf_register (&vpfe->v4l2_dev, &vpfe->notifier); + ret =v4l2_async_nf_register (&vpfe->notifier);if (ret) {vpfe_err (vpfe,"Error registering async notifier\n" ); ret = -EINVAL ;
drivers/media/platform/ti/cal/cal.c +2 -2
@@ -865,7 +865,7 @@ static int cal_async_notifier_register(struct cal_dev *cal)unsigned int i;int ret; -v4l2_async_nf_init (&cal->notifier); +v4l2_async_nf_init (&cal->notifier, &cal->v4l2_dev); cal->notifier.ops = &cal_async_notifier_ops;for (i =0 ; i < cal->data->num_csi2_phy; ++i) {
@@ -889,7 +889,7 @@ static int cal_async_notifier_register(struct cal_dev *cal) casd->phy = phy; } - ret =v4l2_async_nf_register (&cal->v4l2_dev, &cal->notifier); + ret =v4l2_async_nf_register (&cal->notifier);if (ret) {cal_err (cal,"Error registering async notifier\n" ); goto error;
drivers/media/platform/ti/davinci/vpif_capture.c +6 -5
@@ -1483,7 +1483,8 @@ static const struct v4l2_async_notifier_operations vpif_async_ops = { };static struct vpif_capture_config * -vpif_capture_get_pdata (struct platform_device *pdev) +vpif_capture_get_pdata (struct platform_device *pdev, +struct v4l2_device *v4l2_dev) {struct device_node *endpoint =NULL ;struct device_node *rem =NULL ;
@@ -1492,7 +1493,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)struct vpif_capture_chan_config *chan;unsigned int i; -v4l2_async_nf_init (&vpif_obj.notifier); +v4l2_async_nf_init (&vpif_obj.notifier, v4l2_dev);/* * DT boot: OF node from parent device contains
@@ -1640,7 +1641,8 @@ static __init int vpif_probe(struct platform_device *pdev) goto vpif_unregister; }while (++res_idx); - pdev->dev.platform_data =vpif_capture_get_pdata (pdev); + pdev->dev.platform_data = +vpif_capture_get_pdata (pdev, &vpif_obj.v4l2_dev);if (!pdev->dev.platform_data) {dev_warn (&pdev->dev,"Missing platform data. Giving up.\n" ); goto vpif_unregister;
@@ -1683,8 +1685,7 @@ static __init int vpif_probe(struct platform_device *pdev) goto probe_subdev_out; }else { vpif_obj.notifier.ops = &vpif_async_ops; - err =v4l2_async_nf_register (&vpif_obj.v4l2_dev, - &vpif_obj.notifier); + err =v4l2_async_nf_register (&vpif_obj.notifier);if (err) {vpif_err ("Error registering async notifier\n" ); err = -EINVAL ;
drivers/media/platform/ti/omap3isp/isp.c +2 -2
@@ -2420,13 +2420,13 @@ static int isp_probe(struct platform_device *pdev) isp->notifier.ops = &isp_subdev_notifier_ops; -v4l2_async_nf_init (&isp->notifier); +v4l2_async_nf_init (&isp->notifier, &isp->v4l2_dev); ret =isp_parse_of_endpoints (isp);if (ret <0 ) goto error_register_entities; - ret =v4l2_async_nf_register (&isp->v4l2_dev, &isp->notifier); + ret =v4l2_async_nf_register (&isp->notifier);if (ret) goto error_register_entities;
drivers/media/platform/video-mux.c +2 -2
@@ -331,7 +331,7 @@ static int video_mux_async_register(struct video_mux *vmux,unsigned int i;int ret; -v4l2_async_nf_init (&vmux->notifier); +v4l2_async_subdev_nf_init (&vmux->notifier, &vmux->subdev);for (i =0 ; i < num_input_pads; i++) {struct v4l2_async_connection *asd;
@@ -366,7 +366,7 @@ static int video_mux_async_register(struct video_mux *vmux, vmux->notifier.ops = &video_mux_notify_ops; - ret =v4l2_async_subdev_nf_register (&vmux->subdev, &vmux->notifier); + ret =v4l2_async_nf_register (&vmux->notifier);if (ret) goto err_nf_cleanup;
drivers/media/platform/xilinx/xilinx-vipp.c +2 -2
@@ -494,7 +494,7 @@ static int xvip_graph_init(struct xvip_composite_device *xdev) goto done; } -v4l2_async_nf_init (&xdev->notifier); +v4l2_async_nf_init (&xdev->notifier, &xdev->v4l2_dev);/* Parse the graph to extract a list of subdevice DT nodes. */ ret =xvip_graph_parse (xdev);
@@ -512,7 +512,7 @@ static int xvip_graph_init(struct xvip_composite_device *xdev)/* Register the subdevices notifier. */ xdev->notifier.ops = &xvip_graph_notify_ops; - ret =v4l2_async_nf_register (&xdev->v4l2_dev, &xdev->notifier); + ret =v4l2_async_nf_register (&xdev->notifier);if (ret <0 ) {dev_err (xdev->dev,"notifier registration failed\n" ); goto done;
drivers/media/v4l2-core/v4l2-async.c +17 -27
85 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-fwnode.c +2 -2
@@ -1215,7 +1215,7 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd)if (!notifier)return -ENOMEM ; -v4l2_async_nf_init (notifier); +v4l2_async_subdev_nf_init (notifier, sd); ret =v4l2_subdev_get_privacy_led (sd);if (ret <0 )
@@ -1225,7 +1225,7 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd)if (ret <0 ) goto out_cleanup; - ret =v4l2_async_subdev_nf_register (sd, notifier); + ret =v4l2_async_nf_register (notifier);if (ret <0 ) goto out_cleanup;
drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c +1 -1
@@ -825,7 +825,7 @@ int atomisp_csi2_bridge_parse_firmware(struct atomisp_device *isp) {int i, mipi_port, ret; -v4l2_async_nf_init (&isp->notifier); +v4l2_async_nf_init (&isp->notifier, &isp->v4l2_dev); isp->notifier.ops = &atomisp_async_ops;for (i =0 ; i <ATOMISP_CAMERA_NR_PORTS ; i++) {
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +1 -1
@@ -1508,7 +1508,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i isp->firmware =NULL ; isp->css_env.isp_css_fw.data =NULL ; - err =v4l2_async_nf_register (&isp->v4l2_dev, &isp->notifier); + err =v4l2_async_nf_register (&isp->notifier);if (err) {dev_err (isp->dev,"failed to register async notifier : %d\n" , err); goto css_init_fail;
drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c +2 -3
@@ -507,7 +507,7 @@ static int atmel_isc_probe(struct platform_device *pdev)struct fwnode_handle *fwnode =of_fwnode_handle (subdev_entity->epn); -v4l2_async_nf_init (&subdev_entity->notifier); +v4l2_async_nf_init (&subdev_entity->notifier, &isc->v4l2_dev); asd = v4l2_async_nf_add_fwnode_remote(&subdev_entity->notifier, fwnode,
@@ -523,8 +523,7 @@ static int atmel_isc_probe(struct platform_device *pdev) subdev_entity->notifier.ops = &atmel_isc_async_ops; - ret =v4l2_async_nf_register (&isc->v4l2_dev, - &subdev_entity->notifier); + ret =v4l2_async_nf_register (&subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); goto cleanup_subdev;
drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c +2 -3
@@ -497,7 +497,7 @@ static int microchip_xisc_probe(struct platform_device *pdev)struct fwnode_handle *fwnode =of_fwnode_handle (subdev_entity->epn); -v4l2_async_nf_init (&subdev_entity->notifier); +v4l2_async_nf_init (&subdev_entity->notifier, &isc->v4l2_dev); asd = v4l2_async_nf_add_fwnode_remote(&subdev_entity->notifier, fwnode,
@@ -513,8 +513,7 @@ static int microchip_xisc_probe(struct platform_device *pdev) subdev_entity->notifier.ops = &atmel_isc_async_ops; - ret =v4l2_async_nf_register (&isc->v4l2_dev, - &subdev_entity->notifier); + ret =v4l2_async_nf_register (&subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); goto cleanup_subdev;
drivers/staging/media/imx/imx-media-csi.c +2 -2
@@ -1918,7 +1918,7 @@ static int imx_csi_async_register(struct csi_priv *priv)unsigned int port;int ret; -v4l2_async_nf_init (&priv->notifier); +v4l2_async_subdev_nf_init (&priv->notifier, &priv->sd);/* get this CSI's port id */ ret =fwnode_property_read_u32 (dev_fwnode (priv->dev),"reg" , &port);
@@ -1944,7 +1944,7 @@ static int imx_csi_async_register(struct csi_priv *priv) priv->notifier.ops = &csi_notify_ops; - ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier); + ret =v4l2_async_nf_register (&priv->notifier);if (ret)return ret;
drivers/staging/media/imx/imx-media-dev-common.c +2 -2
@@ -367,7 +367,7 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev,INIT_LIST_HEAD (&imxmd->vdev_list); -v4l2_async_nf_init (&imxmd->notifier); +v4l2_async_nf_init (&imxmd->notifier, &imxmd->v4l2_dev);return imxmd;
@@ -391,7 +391,7 @@ int imx_media_dev_notifier_register(struct imx_media_dev *imxmd,/* prepare the async subdev notifier and register it */ imxmd->notifier.ops = ops ? ops : &imx_media_notifier_ops; - ret =v4l2_async_nf_register (&imxmd->v4l2_dev, &imxmd->notifier); + ret =v4l2_async_nf_register (&imxmd->notifier);if (ret) {v4l2_err (&imxmd->v4l2_dev,"v4l2_async_nf_register failed with %d\n" , ret);
drivers/staging/media/imx/imx6-mipi-csi2.c +2 -2
@@ -680,7 +680,7 @@ static int csi2_async_register(struct csi2_dev *csi2)struct fwnode_handle *ep;int ret; -v4l2_async_nf_init (&csi2->notifier); +v4l2_async_subdev_nf_init (&csi2->notifier, &csi2->sd); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi2->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -705,7 +705,7 @@ static int csi2_async_register(struct csi2_dev *csi2) csi2->notifier.ops = &csi2_notify_ops; - ret =v4l2_async_subdev_nf_register (&csi2->sd, &csi2->notifier); + ret =v4l2_async_nf_register (&csi2->notifier);if (ret)return ret;
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c +2 -2
@@ -536,7 +536,7 @@ int sun6i_isp_proc_setup(struct sun6i_isp_device *isp_dev)/* V4L2 Async */ -v4l2_async_nf_init (notifier); +v4l2_async_nf_init (notifier, v4l2_dev); notifier->ops = &sun6i_isp_proc_notifier_ops; sun6i_isp_proc_source_setup(isp_dev, &proc->source_csi0,
@@ -544,7 +544,7 @@ int sun6i_isp_proc_setup(struct sun6i_isp_device *isp_dev)sun6i_isp_proc_source_setup (isp_dev, &proc->source_csi1,SUN6I_ISP_PORT_CSI1 ); - ret =v4l2_async_nf_register (v4l2_dev, notifier); + ret =v4l2_async_nf_register (notifier);if (ret) {v4l2_err (v4l2_dev,"failed to register v4l2 async notifier: %d\n" , ret);
drivers/staging/media/tegra-video/vi.c +2 -3
@@ -1181,7 +1181,7 @@ static int tegra_channel_init(struct tegra_vi_channel *chan) }if (!IS_ENABLED (CONFIG_VIDEO_TEGRA_TPG )) -v4l2_async_nf_init (&chan->notifier); +v4l2_async_nf_init (&chan->notifier, &vid->v4l2_dev);return 0 ;
@@ -1748,7 +1748,6 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan,static int tegra_vi_graph_init (struct tegra_vi *vi) { -struct tegra_video_device *vid =dev_get_drvdata (vi->client.host);struct tegra_vi_channel *chan;struct fwnode_handle *fwnode =dev_fwnode (vi->dev);int ret;
@@ -1779,7 +1778,7 @@ static int tegra_vi_graph_init(struct tegra_vi *vi)continue ; chan->notifier.ops = &tegra_vi_async_ops; - ret =v4l2_async_nf_register (&vid->v4l2_dev, &chan->notifier); + ret =v4l2_async_nf_register (&chan->notifier);if (ret <0 ) { dev_err(vi->dev, "failed to register channel %d notifier: %d\n",
include/media/v4l2-async.h +19 -14
@@ -148,13 +148,30 @@ void v4l2_async_debug_init(struct dentry *debugfs_dir);* v4l2_async_nf_init - Initialize a notifier. * * @notifier: pointer to &struct v4l2_async_notifier +* @v4l2_dev: pointer to &struct v4l2_device +* +* This function initializes the notifier @asc_entry. It must be called +* before adding a subdevice to a notifier, using one of: +* v4l2_async_nf_add_fwnode_remote(), +* v4l2_async_nf_add_fwnode() or +* v4l2_async_nf_add_i2c(). +*/ +void v4l2_async_nf_init (struct v4l2_async_notifier *notifier, +struct v4l2_device *v4l2_dev); + +/** +* v4l2_async_subdev_nf_init - Initialize a sub-device notifier. +* +* @notifier: pointer to &struct v4l2_async_notifier +* @sd: pointer to &struct v4l2_subdev * * This function initializes the notifier @asc_list. It must be called * before adding a subdevice to a notifier, using one of: * v4l2_async_nf_add_fwnode_remote(), v4l2_async_nf_add_fwnode() or * v4l2_async_nf_add_i2c(). */ -void v4l2_async_nf_init (struct v4l2_async_notifier *notifier); +void v4l2_async_subdev_nf_init (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *sd);struct v4l2_async_connection * __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier,
@@ -259,21 +276,9 @@ v4l2_async_connection_unique(struct v4l2_subdev *sd);/** * v4l2_async_nf_register - registers a subdevice asynchronous notifier * -* @v4l2_dev: pointer to &struct v4l2_device -* @notifier: pointer to &struct v4l2_async_notifier -*/ -int v4l2_async_nf_register (struct v4l2_device *v4l2_dev, -struct v4l2_async_notifier *notifier); - -/** -* v4l2_async_subdev_nf_register - registers a subdevice asynchronous -* notifier for a sub-device -* -* @sd: pointer to &struct v4l2_subdev * @notifier: pointer to &struct v4l2_async_notifier */ -int v4l2_async_subdev_nf_register (struct v4l2_subdev *sd, -struct v4l2_async_notifier *notifier); +int v4l2_async_nf_register (struct v4l2_async_notifier *notifier);/** * v4l2_async_nf_unregister - unregisters a subdevice
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v6 38/38 media: Documentation: v4l: Document sub-device notifiers
In reply to Sakari AilusDocument that sub-device notifiers are now registered using v4l2_async_subdev_nf_init(). No documentation is changed as it seems that sub-device notifiers were not documented apart from kernel-doc comments.
--- Documentation/driver-api/media/v4l2-subdev.rst | 11 +++++++++++ 1 file changed, 11 insertions(+)
Documentation/driver-api/media/v4l2-subdev.rst +11 -0
@@ -218,6 +218,17 @@ available. There may be one or more async connections to a given sub-device but this is not known at the time of adding the connections to the notifier. Async connections are bound as matching async sub-devices are found, one by one. +Asynchronous sub-device notifier for sub-devices +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +A driver that registers an asynchronous sub-device may also register an +asynchronous notifier. This is called an asynchronous sub-device notifier andthe +process is similar to that of a bridge driver apart from that the notifier is +initialised using :c:func:`v4l2_async_subdev_nf_init` instead. A sub-device +notifier may complete only after the V4L2 device becomes available, i.e. there's +a path via async sub-devices and notifiers to a notifier that is not an +asynchronous sub-device notifier. + Asynchronous sub-device registration helper for camera sensor drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Signature · 1 line
2.39.2
Mauro Carvalho Chehab
maintainerRe: [PATCH v6 38/38] media: Documentation: v4l: Document sub-device notifiers
Em Thu, 27 Jul 2023 08:42:55 +0300
Sakari Ailus <[email protected]> escreveu:
Quoted 25 lines
Document that sub-device notifiers are now registered using
v4l2_async_subdev_nf_init(). No documentation is changed as it seems that sub-device notifiers were not documented apart from kernel-doc comments.Signed-off-by Sakari Ailus <[email protected]>--- Documentation/driver-api/media/v4l2-subdev.rst | 11 +++++++++++ 1 file changed, 11 insertions(+)Documentation/driver-api/media/v4l2-subdev.rst +4
-0@@ -218,6 +218,17 @@ available. There may be one or more async connections to a given sub-device but this is not known at the time of adding the connections to the notifier. Async connections are bound as matching async sub-devices are found, one by one. +Asynchronous sub-device notifier for sub-devices +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +A driver that registers an asynchronous sub-device may also register an
Documentation/driver-api/media/v4l2-subdev.rst available. There may be one or more async connections to a given sub-device but · line 234
Quoted 10 lines
Documentation/driver-api/media/v4l2-subdev.rst +7
-0+asynchronous notifier. This is called an asynchronous sub-device notifier andthe +process is similar to that of a bridge driver apart from that the notifier is +initialised using :c:func:`v4l2_async_subdev_nf_init` instead. A sub-device +notifier may complete only after the V4L2 device becomes available, i.e. there's +a path via async sub-devices and notifiers to a notifier that is not an +asynchronous sub-device notifier. + Asynchronous sub-device registration helper for camera sensor drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Hmm... you did a lot of reorder at the code for async devices. IMO, you should be pointing at the documentation what's the expected order of kAPI usage: what comes first? V4L2 register? async notifiers? etc.
Regards
Thanks,
Mauro