media-workshop

media-workshop@linuxtv.org

113 discussions

Who is going to the ELC and should we do a 1-2 day workshop in San Diego?
by Hans Verkuil 28 Jan '16

28 Jan '16

The subject says it all :-) For the record: I'm going and I think a 1 day workshop is probably useful. I'm not sure if we have enough material for 2 days. Regards, Hans

4 4

[PATCH RFC] [media] Postpone the addition of MEDIA_IOC_G_TOPOLOGY
by Mauro Carvalho Chehab 28 Dec '15

28 Dec '15

There are a few discussions left with regards to this ioctl: 1) the name of the new structs will contain _v2_ on it? 2) what's the best alternative to avoid compat32 issues? Due to that, let's postpone the addition of this new ioctl to the next Kernel version, to give people more time to discuss it. Signed-off-by: Mauro Carvalho Chehab <mchehab(a)osg.samsung.com> --- Documentation/DocBook/media/v4l/media-ioc-g-topology.xml | 3 +++ drivers/media/media-device.c | 5 ++++- include/uapi/linux/media.h | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml b/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml index e0d49fa329f0..63152ab9efba 100644 --- a/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml +++ b/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml @@ -48,6 +48,9 @@ <refsect1> <title>Description</title> + + <para><emphasis role="bold">NOTE:</emphasis> This new ioctl is programmed to be added on Kernel 4.6. Its definition/arguments may change until its final version.</para> + <para>The typical usage of this ioctl is to call it twice. On the first call, the structure defined at &media-v2-topology; should be zeroed. At return, if no errors happen, this ioctl will return the diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 4d1c13de494b..900124c04e9a 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -234,6 +234,7 @@ static long media_device_setup_link(struct media_device *mdev, return ret; } +#if 0 /* Let's postpone it to Kernel 4.6 */ static long __media_device_get_topology(struct media_device *mdev, struct media_v2_topology *topo) { @@ -389,6 +390,7 @@ static long media_device_get_topology(struct media_device *mdev, return 0; } +#endif static long media_device_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) @@ -422,13 +424,14 @@ static long media_device_ioctl(struct file *filp, unsigned int cmd, mutex_unlock(&dev->graph_mutex); break; +#if 0 /* Let's postpone it to Kernel 4.6 */ case MEDIA_IOC_G_TOPOLOGY: mutex_lock(&dev->graph_mutex); ret = media_device_get_topology(dev, (struct media_v2_topology __user *)arg); mutex_unlock(&dev->graph_mutex); break; - +#endif default: ret = -ENOIOCTLCMD; } diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 5dbb208e5451..1e3c8cb43bd7 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -286,7 +286,7 @@ struct media_links_enum { * later, before the adding this API upstream. */ - +#if 0 /* Let's postpone it to Kernel 4.6 */ struct media_v2_entity { __u32 id; char name[64]; /* FIXME: move to a property? (RFC says so) */ @@ -351,6 +351,7 @@ static inline void __user *media_get_uptr(__u64 arg) { return (void __user *)(uintptr_t)arg; } +#endif /* ioctls */ @@ -358,6 +359,9 @@ static inline void __user *media_get_uptr(__u64 arg) #define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc) #define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum) #define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc) + +#if 0 /* Let's postpone it to Kernel 4.6 */ #define MEDIA_IOC_G_TOPOLOGY _IOWR('|', 0x04, struct media_v2_topology) +#endif #endif /* __LINUX_MEDIA_H */ -- 2.5.0

1 0

[PATCH] dvbdev: remove two dead functions if !CONFIG_MEDIA_CONTROLLER_DVB
by Mauro Carvalho Chehab 28 Dec '15

28 Dec '15

Those functions are used only if CONFIG_MEDIA_CONTROLLER_DVB. Without that, if !CONFIG_MEDIA_CONTROLLER_DVB, it would produce two warnings: drivers/media/dvb-core/dvbdev.c:219:12: warning: 'dvb_create_tsout_entity' defined but not used [-Wunused-function] static int dvb_create_tsout_entity(struct dvb_device *dvbdev, ^ drivers/media/dvb-core/dvbdev.c:264:12: warning: 'dvb_create_media_entity' defined but not used [-Wunused-function] static int dvb_create_media_entity(struct dvb_device *dvbdev, ^ Signed-off-by: Mauro Carvalho Chehab <mchehab(a)osg.samsung.com> --- drivers/media/dvb-core/dvbdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index b56e00817d3f..860dd7d06b60 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -216,10 +216,10 @@ static void dvb_media_device_free(struct dvb_device *dvbdev) #endif } +#if defined(CONFIG_MEDIA_CONTROLLER_DVB) static int dvb_create_tsout_entity(struct dvb_device *dvbdev, const char *name, int npads) { -#if defined(CONFIG_MEDIA_CONTROLLER_DVB) int i, ret = 0; dvbdev->tsout_pads = kcalloc(npads, sizeof(*dvbdev->tsout_pads), @@ -254,7 +254,6 @@ static int dvb_create_tsout_entity(struct dvb_device *dvbdev, if (ret < 0) return ret; } -#endif return 0; } @@ -264,7 +263,6 @@ static int dvb_create_tsout_entity(struct dvb_device *dvbdev, static int dvb_create_media_entity(struct dvb_device *dvbdev, int type, int demux_sink_pads) { -#if defined(CONFIG_MEDIA_CONTROLLER_DVB) int i, ret, npads; switch (type) { @@ -352,9 +350,9 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev, printk(KERN_DEBUG "%s: media entity '%s' registered.\n", __func__, dvbdev->entity->name); -#endif return 0; } +#endif static int dvb_register_media_device(struct dvb_device *dvbdev, int type, int minor, -- 2.5.0

1 0

[PATCH] [media] usb: check media device errors
by Mauro Carvalho Chehab 28 Dec '15

28 Dec '15

There are now two new warnings: drivers/media/usb/dvb-usb-v2/dvb_usb_core.c: In function 'dvb_usbv2_media_device_register': drivers/media/usb/dvb-usb-v2/dvb_usb_core.c:433:2: warning: ignoring return value of '__media_device_register', declared with attribute warn_unused_result [-Wunused-result] media_device_register(adap->dvb_adap.mdev); ^ drivers/media/usb/dvb-usb/dvb-usb-dvb.c: In function 'dvb_usb_media_device_register': drivers/media/usb/dvb-usb/dvb-usb-dvb.c:128:2: warning: ignoring return value of '__media_device_register', declared with attribute warn_unused_result [-Wunused-result] media_device_register(adap->dvb_adap.mdev); ^ Those are because the drivers are not properly checking if the media device init and register were succeeded. Fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab(a)osg.samsung.com> --- drivers/media/usb/au0828/au0828-core.c | 16 ++++++++++++---- drivers/media/usb/cx231xx/cx231xx-cards.c | 13 ++++++++++--- drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 23 ++++++++++++++++------- drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 22 ++++++++++++++++------ 4 files changed, 54 insertions(+), 20 deletions(-) diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index e7aab47ae4f5..86388c14204a 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -217,15 +217,15 @@ static void au0828_usb_disconnect(struct usb_interface *interface) au0828_usb_release(dev); } -static void au0828_media_device_init(struct au0828_dev *dev, - struct usb_device *udev) +static int au0828_media_device_init(struct au0828_dev *dev, + struct usb_device *udev) { #ifdef CONFIG_MEDIA_CONTROLLER struct media_device *mdev; mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); if (!mdev) - return; + return -ENOMEM; mdev->dev = &udev->dev; @@ -243,6 +243,7 @@ static void au0828_media_device_init(struct au0828_dev *dev, dev->media_dev = mdev; #endif + return 0; } @@ -368,7 +369,14 @@ static int au0828_usb_probe(struct usb_interface *interface, dev->board = au0828_boards[dev->boardnr]; /* Initialize the media controller */ - au0828_media_device_init(dev, usbdev); + retval = au0828_media_device_init(dev, usbdev); + if (retval) { + pr_err("%s() au0828_media_device_init failed\n", + __func__); + mutex_unlock(&dev->lock); + kfree(dev); + return retval; + } #ifdef CONFIG_VIDEO_AU0828_V4L2 dev->v4l2_dev.release = au0828_usb_v4l2_release; diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 2e997f09a4cd..6acca3495361 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -1206,7 +1206,7 @@ void cx231xx_release_resources(struct cx231xx *dev) clear_bit(dev->devno, &cx231xx_devused); } -static void cx231xx_media_device_init(struct cx231xx *dev, +static int cx231xx_media_device_init(struct cx231xx *dev, struct usb_device *udev) { #ifdef CONFIG_MEDIA_CONTROLLER @@ -1214,7 +1214,7 @@ static void cx231xx_media_device_init(struct cx231xx *dev, mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); if (!mdev) - return; + return -ENOMEM; mdev->dev = dev->dev; strlcpy(mdev->model, dev->board.name, sizeof(mdev->model)); @@ -1228,6 +1228,7 @@ static void cx231xx_media_device_init(struct cx231xx *dev, dev->media_dev = mdev; #endif + return 0; } static int cx231xx_create_media_graph(struct cx231xx *dev) @@ -1663,7 +1664,11 @@ static int cx231xx_usb_probe(struct usb_interface *interface, usb_set_intfdata(interface, dev); /* Initialize the media controller */ - cx231xx_media_device_init(dev, udev); + retval = cx231xx_media_device_init(dev, udev); + if (retval) { + dev_err(d, "cx231xx_media_device_init failed\n"); + goto err_media_init; + } /* Create v4l2 device */ #ifdef CONFIG_MEDIA_CONTROLLER @@ -1756,6 +1761,8 @@ err_video_alt: err_init: v4l2_device_unregister(&dev->v4l2_dev); err_v4l2: + cx231xx_unregister_media_device(dev); +err_media_init: usb_set_intfdata(interface, NULL); err_if: usb_put_dev(udev); diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c index 7f52bcbd8b0d..0fa2c45917b0 100644 --- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c +++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c @@ -400,7 +400,7 @@ skip_feed_stop: return ret; } -static void dvb_usbv2_media_device_init(struct dvb_usb_adapter *adap) +static int dvb_usbv2_media_device_init(struct dvb_usb_adapter *adap) { #ifdef CONFIG_MEDIA_CONTROLLER_DVB struct media_device *mdev; @@ -409,7 +409,7 @@ static void dvb_usbv2_media_device_init(struct dvb_usb_adapter *adap) mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); if (!mdev) - return; + return -ENOMEM; mdev->dev = &udev->dev; strlcpy(mdev->model, d->name, sizeof(mdev->model)); @@ -425,12 +425,15 @@ static void dvb_usbv2_media_device_init(struct dvb_usb_adapter *adap) dev_info(&d->udev->dev, "media controller created\n"); #endif + return 0; } -static void dvb_usbv2_media_device_register(struct dvb_usb_adapter *adap) +static int dvb_usbv2_media_device_register(struct dvb_usb_adapter *adap) { #ifdef CONFIG_MEDIA_CONTROLLER_DVB - media_device_register(adap->dvb_adap.mdev); + return media_device_register(adap->dvb_adap.mdev); +#else + return 0; #endif } @@ -466,7 +469,12 @@ static int dvb_usbv2_adapter_dvb_init(struct dvb_usb_adapter *adap) adap->dvb_adap.priv = adap; - dvb_usbv2_media_device_init(adap); + ret = dvb_usbv2_media_device_init(adap); + if (ret < 0) { + dev_dbg(&d->udev->dev, "%s: dvb_usbv2_media_device_init() failed=%d\n", + __func__, ret); + goto err_dvb_register_mc; + } if (d->props->read_mac_address) { ret = d->props->read_mac_address(adap, @@ -517,6 +525,7 @@ err_dvb_dmxdev_init: dvb_dmx_release(&adap->demux); err_dvb_dmx_init: dvb_usbv2_media_device_unregister(adap); +err_dvb_register_mc: dvb_unregister_adapter(&adap->dvb_adap); err_dvb_register_adapter: adap->dvb_adap.priv = NULL; @@ -701,9 +710,9 @@ static int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap) if (ret < 0) goto err_dvb_unregister_frontend; - dvb_usbv2_media_device_register(adap); + ret = dvb_usbv2_media_device_register(adap); - return 0; + return ret; err_dvb_unregister_frontend: for (i = count_registered - 1; i >= 0; i--) diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c index 6a4bb2d86175..241463ef631e 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c @@ -95,7 +95,7 @@ static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) return dvb_usb_ctrl_feed(dvbdmxfeed, 0); } -static void dvb_usb_media_device_init(struct dvb_usb_adapter *adap) +static int dvb_usb_media_device_init(struct dvb_usb_adapter *adap) { #ifdef CONFIG_MEDIA_CONTROLLER_DVB struct media_device *mdev; @@ -104,7 +104,7 @@ static void dvb_usb_media_device_init(struct dvb_usb_adapter *adap) mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); if (!mdev) - return; + return -ENOMEM; mdev->dev = &udev->dev; strlcpy(mdev->model, d->desc->name, sizeof(mdev->model)); @@ -120,12 +120,15 @@ static void dvb_usb_media_device_init(struct dvb_usb_adapter *adap) dev_info(&d->udev->dev, "media controller created\n"); #endif + return 0; } -static void dvb_usb_media_device_register(struct dvb_usb_adapter *adap) +static int dvb_usb_media_device_register(struct dvb_usb_adapter *adap) { #ifdef CONFIG_MEDIA_CONTROLLER_DVB - media_device_register(adap->dvb_adap.mdev); + return media_device_register(adap->dvb_adap.mdev); +#else + return 0; #endif } @@ -155,7 +158,11 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums) } adap->dvb_adap.priv = adap; - dvb_usb_media_device_init(adap); + ret = dvb_usb_media_device_init(adap); + if (ret < 0) { + deb_info("dvb_usb_media_device_init failed: error %d", ret); + goto err_mc; + } if (adap->dev->props.read_mac_address) { if (adap->dev->props.read_mac_address(adap->dev, adap->dvb_adap.proposed_mac) == 0) @@ -205,6 +212,7 @@ err_dmx_dev: dvb_dmx_release(&adap->demux); err_dmx: dvb_usb_media_device_unregister(adap); +err_mc: dvb_unregister_adapter(&adap->dvb_adap); err: return ret; @@ -323,8 +331,10 @@ int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap) return ret; ret = dvb_create_media_graph(&adap->dvb_adap); + if (ret) + return ret; - dvb_usb_media_device_register(adap); + ret = dvb_usb_media_device_register(adap); return ret; } -- 2.5.0

1 0

[PATCH] [media] call media_device_init() before registering the V4L2 device
by Mauro Carvalho Chehab 28 Dec '15

28 Dec '15

Currently, v4l2_device_register() doesn't use the media_device struct. So, calling media_device_init() could be called either before or after v4l2_device_register(). Yet, it is a good practice to initialize everything before calling the register functions. Also, the other drivers call media_device_init() before registering the V4L2 device. So, move the call for media_device_init() to happen earlier on exynos4-is and s3c-camif. This is just a cleanup patch. Signed-off-by: Mauro Carvalho Chehab <mchehab(a)osg.samsung.com> --- drivers/media/platform/exynos4-is/media-dev.c | 4 ++-- drivers/media/platform/s3c-camif/camif-core.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index 27663dd45294..e96d246043ad 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -1347,14 +1347,14 @@ static int fimc_md_probe(struct platform_device *pdev) fmd->use_isp = fimc_md_is_isp_available(dev->of_node); fmd->user_subdev_api = true; + media_device_init(&fmd->media_dev); + ret = v4l2_device_register(dev, &fmd->v4l2_dev); if (ret < 0) { v4l2_err(v4l2_dev, "Failed to register v4l2_device: %d\n", ret); return ret; } - media_device_init(&fmd->media_dev); - ret = fimc_md_get_clocks(fmd); if (ret) goto err_md; diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c index ea02b7ef2119..0b44b9accf50 100644 --- a/drivers/media/platform/s3c-camif/camif-core.c +++ b/drivers/media/platform/s3c-camif/camif-core.c @@ -324,12 +324,12 @@ static int camif_media_dev_init(struct camif_dev *camif) strlcpy(v4l2_dev->name, "s3c-camif", sizeof(v4l2_dev->name)); v4l2_dev->mdev = md; - ret = v4l2_device_register(camif->dev, v4l2_dev); - if (ret < 0) - return ret; - media_device_init(md); + ret = v4l2_device_register(camif->dev, v4l2_dev); + if (ret < 0) + return ret; + return ret; } -- 2.5.0

1 0

[PATCH] [media] media-device:remove BUG_ON() from media_device_init()
by Mauro Carvalho Chehab 28 Dec '15

28 Dec '15

The BUG_ON() doesn't make much sense here, as no driver would ask to initialize a media_device if this is not created earlier. Suggested-by: Sakari Ailus <sakari.ailus(a)iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab(a)osg.samsung.com> --- drivers/media/media-device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 76e2b2f3a15f..b718c783debd 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -627,9 +627,6 @@ EXPORT_SYMBOL_GPL(media_device_unregister_entity); */ void media_device_init(struct media_device *mdev) { - - BUG_ON(mdev->dev == NULL); - INIT_LIST_HEAD(&mdev->entities); INIT_LIST_HEAD(&mdev->interfaces); INIT_LIST_HEAD(&mdev->pads); -- 2.5.0

1 0

[PATCH v8.4 00/83] Media MC patches
by Mauro Carvalho Chehab 11 Dec '15

11 Dec '15

As requested by Sakari and Hans, I'm re-sending the entire 83 patch series that were already sent to the media ML. NOTE: as agreed on IRC, after getting the ack for those patches, eventually adding newer fixups where needed, we should add this to the media-controller topic branch of our devel tree. Before merging this on the "master" branch, we'll: 1) add a patch series that Sakari is working to allow not using the entity_id for the graph traversal; 2) add a patch converting MC next gen to use a single range, as agreed on IRC; 3) add a patch increasing the maximum number of objects, in order for the graph traversal to work with DVB drivers; 4) get ALSA maintainer's acks for the ALSA changes (on this series and on Shuah's series); 5) add Shuah ALSA patches. I'll do the above work after getting the acks for the patches already sent. Javier Martinez Canillas (13): [media] staging: omap4iss: get entity ID using media_entity_id() [media] omap3isp: get entity ID using media_entity_id() [media] media: use entity.graph_obj.mdev instead of .parent [media] media: remove media entity .parent field [media] omap3isp: separate links creation from entities init [media] omap3isp: create links after all subdevs have been bound [media] staging: omap4iss: separate links creation from entities init [media] v4l: vsp1: create pad links after subdev registration [media] v4l: vsp1: separate links creation from entities init [media] uvcvideo: create pad links after subdev registration [media] smiapp: create pad links after subdev registration [media] media-entity: init pads on entity init if was registered before media: don't try to empty links list in media_entity_cleanup() Mauro Carvalho Chehab (70): [media] media: create a macro to get entity ID [media] media: add a common struct to be embed on media graph objects [media] media: use media_gobj inside entities [media] media: use media_gobj inside pads [media] media: use media_gobj inside links [media] media: add messages when media device gets (un)registered [media] media: add a debug message to warn about gobj creation/removal [media] media: rename the function that create pad links [media] uapi/media.h: Declare interface types for V4L2 and DVB [media] media: add functions to allow creating interfaces [media] uapi/media.h: Declare interface types for ALSA [media] media: Don't accept early-created links [media] media: convert links from array to list [media] media: make add link more generic [media] media: make media_link more generic to handle interace links [media] media: make link debug printk more generic [media] media: add support to link interfaces and entities [media] media-entity: add a helper function to create interface [media] dvbdev: add support for interfaces [media] media: add a linked list to track interfaces by mdev [media] dvbdev: add support for indirect interface links [media] uapi/media.h: Fix entity namespace [media] replace all occurrences of MEDIA_ENT_T_DEVNODE_V4L [media] replace all occurrences of MEDIA_ENT_T_DEVNODE_DVB [media] media: add macros to check if subdev or V4L2 DMA [media] media: use macros to check for V4L2 subdev entities [media] omap3/omap4/davinci: get rid of MEDIA_ENT_T_V4L2_SUBDEV abuse [media] s5c73m3: fix subdev type [media] s5k5baf: fix subdev type [media] davinci_vbpe: stop MEDIA_ENT_T_V4L2_SUBDEV abuse [media] omap4iss: stop MEDIA_ENT_T_V4L2_SUBDEV abuse [media] v4l2-subdev: use MEDIA_ENT_T_UNKNOWN for new subdevs [media] media controller: get rid of entity subtype on Kernel [media] media.h: don't use legacy entity macros at Kernel [media] DocBook: update descriptions for the media controller entities [media] dvb: modify core to implement interfaces/entities at MC new gen [media] media: report if a pad is sink or source at debug msg [media] uapi/media.h: Add MEDIA_IOC_G_TOPOLOGY ioctl [media] media: Use a macro to interate between all interfaces [media] media: move mdev list init to gobj [media] media-device: add pads and links to media_device [media] media_device: add a topology version field [media] media-device: add support for MEDIA_IOC_G_TOPOLOGY ioctl [media] media-entity: unregister entity links [media] remove interface links at media_entity_unregister() [media] media-device: remove interfaces and interface links [media] au0828: unregister MC at the end [media] v4l2-core: create MC interfaces for devnodes [media] media-entity.h: document all the structs [media] tuner-core: add an input pad [media] au0828: add support for the connectors [media] au0828: Create connector links [media] media-device: supress backlinks at G_TOPOLOGY ioctl [media] media-controller: enable all interface links at init [media] media.h: create connector entities for hybrid TV devices [media] dvbdev: returns error if graph object creation fails [media] dvb core: must check dvb_create_media_graph() [media] media-entity: enforce check of interface and links creation [media] cx231xx: enforce check for graph creation [media] au0828:: enforce check for graph creation [media] media-entity: must check media_create_pad_link() [media] media-entity.h: rename entity.type to entity.function [media] media-device: export the entity function via new ioctl [media] uapi/media.h: Rename entities types to functions [media] DocBook: update entities documentation [media] dvbdev: move indirect links on dvr/demux to a separate function [media] dvbdev: Don't create indirect links [media] media_entity: remove gfp_flags argument [media] media-device: use unsigned ints on some places [media] media-entity.c: get rid of var length arrays .../DocBook/media/v4l/media-ioc-enum-entities.xml | 67 +-- Documentation/media-framework.txt | 2 +- Documentation/video4linux/v4l2-framework.txt | 4 +- drivers/media/common/siano/smsdvb-main.c | 6 +- drivers/media/dvb-core/dmxdev.c | 4 +- drivers/media/dvb-core/dvb_ca_en50221.c | 2 +- drivers/media/dvb-core/dvb_frontend.c | 11 +- drivers/media/dvb-core/dvb_net.c | 2 +- drivers/media/dvb-core/dvbdev.c | 392 +++++++++++++---- drivers/media/dvb-core/dvbdev.h | 17 +- drivers/media/dvb-frontends/au8522_decoder.c | 2 +- drivers/media/firewire/firedtv-ci.c | 2 +- drivers/media/i2c/adp1653.c | 2 +- drivers/media/i2c/adv7180.c | 2 +- drivers/media/i2c/as3645a.c | 2 +- drivers/media/i2c/cx25840/cx25840-core.c | 2 +- drivers/media/i2c/lm3560.c | 2 +- drivers/media/i2c/lm3646.c | 2 +- drivers/media/i2c/m5mols/m5mols_core.c | 2 +- drivers/media/i2c/noon010pc30.c | 2 +- drivers/media/i2c/ov2659.c | 2 +- drivers/media/i2c/ov9650.c | 2 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 8 +- drivers/media/i2c/s5k4ecgx.c | 2 +- drivers/media/i2c/s5k5baf.c | 8 +- drivers/media/i2c/s5k6aa.c | 2 +- drivers/media/i2c/smiapp/smiapp-core.c | 22 +- drivers/media/i2c/tvp514x.c | 2 +- drivers/media/i2c/tvp7002.c | 2 +- drivers/media/media-device.c | 272 ++++++++++-- drivers/media/media-entity.c | 478 +++++++++++++++++---- drivers/media/pci/bt8xx/dst_ca.c | 3 +- drivers/media/pci/ddbridge/ddbridge-core.c | 2 +- drivers/media/pci/ngene/ngene-core.c | 2 +- drivers/media/pci/ttpci/av7110.c | 2 +- drivers/media/pci/ttpci/av7110_av.c | 4 +- drivers/media/pci/ttpci/av7110_ca.c | 2 +- drivers/media/platform/exynos4-is/common.c | 3 +- drivers/media/platform/exynos4-is/fimc-capture.c | 5 +- drivers/media/platform/exynos4-is/fimc-isp-video.c | 9 +- drivers/media/platform/exynos4-is/fimc-lite.c | 18 +- drivers/media/platform/exynos4-is/media-dev.c | 25 +- drivers/media/platform/exynos4-is/media-dev.h | 8 +- drivers/media/platform/omap3isp/isp.c | 202 +++++---- drivers/media/platform/omap3isp/ispccdc.c | 39 +- drivers/media/platform/omap3isp/ispccdc.h | 1 + drivers/media/platform/omap3isp/ispccp2.c | 35 +- drivers/media/platform/omap3isp/ispccp2.h | 1 + drivers/media/platform/omap3isp/ispcsi2.c | 33 +- drivers/media/platform/omap3isp/ispcsi2.h | 1 + drivers/media/platform/omap3isp/isppreview.c | 48 ++- drivers/media/platform/omap3isp/isppreview.h | 1 + drivers/media/platform/omap3isp/ispresizer.c | 46 +- drivers/media/platform/omap3isp/ispresizer.h | 1 + drivers/media/platform/omap3isp/ispvideo.c | 17 +- drivers/media/platform/s3c-camif/camif-capture.c | 2 +- drivers/media/platform/s3c-camif/camif-core.c | 4 +- drivers/media/platform/vsp1/vsp1_drv.c | 34 +- drivers/media/platform/vsp1/vsp1_rpf.c | 29 +- drivers/media/platform/vsp1/vsp1_rwpf.h | 5 + drivers/media/platform/vsp1/vsp1_video.c | 15 +- drivers/media/platform/vsp1/vsp1_wpf.c | 40 +- drivers/media/platform/xilinx/xilinx-dma.c | 10 +- drivers/media/platform/xilinx/xilinx-vipp.c | 4 +- drivers/media/usb/au0828/au0828-core.c | 98 ++++- drivers/media/usb/au0828/au0828-dvb.c | 8 +- drivers/media/usb/au0828/au0828-video.c | 84 +++- drivers/media/usb/au0828/au0828.h | 3 +- drivers/media/usb/cx231xx/cx231xx-cards.c | 46 +- drivers/media/usb/cx231xx/cx231xx-dvb.c | 6 +- drivers/media/usb/cx231xx/cx231xx-video.c | 10 +- drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 4 +- drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 6 +- drivers/media/usb/uvc/uvc_entity.c | 25 +- drivers/media/v4l2-core/tuner-core.c | 10 +- drivers/media/v4l2-core/v4l2-dev.c | 112 ++++- drivers/media/v4l2-core/v4l2-device.c | 16 +- drivers/media/v4l2-core/v4l2-flash-led-class.c | 2 +- drivers/media/v4l2-core/v4l2-subdev.c | 8 +- drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 9 +- drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 15 +- drivers/staging/media/davinci_vpfe/dm365_isif.c | 15 +- drivers/staging/media/davinci_vpfe/dm365_resizer.c | 33 +- .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 10 +- drivers/staging/media/davinci_vpfe/vpfe_video.c | 17 +- drivers/staging/media/omap4iss/iss.c | 123 ++++-- drivers/staging/media/omap4iss/iss_csi2.c | 46 +- drivers/staging/media/omap4iss/iss_csi2.h | 1 + drivers/staging/media/omap4iss/iss_ipipe.c | 9 +- drivers/staging/media/omap4iss/iss_ipipeif.c | 42 +- drivers/staging/media/omap4iss/iss_ipipeif.h | 1 + drivers/staging/media/omap4iss/iss_resizer.c | 40 +- drivers/staging/media/omap4iss/iss_resizer.h | 1 + drivers/staging/media/omap4iss/iss_video.c | 9 +- include/media/media-device.h | 34 +- include/media/media-entity.h | 322 ++++++++++++-- include/media/tuner.h | 8 + include/media/v4l2-dev.h | 1 + include/uapi/linux/media.h | 214 ++++++++- 99 files changed, 2535 insertions(+), 831 deletions(-) -- 2.4.3

7 179

Etherpad notes of the KS meeting in Seoul
by Mauro Carvalho Chehab 03 Nov '15

03 Nov '15

Those are the final version of the Etherpad notes we took during the Media Workshop at the Kernel Summit. Please review. I should be preparing the final report of the meeting latter this week. Regards, Mauro --- Media Summit Seoul 2015 Attendees list: * Shuah Khan - Samsung OSG shuahkh(a)osg.samsung.com * Laurent Pinchart - Ideas on Board * Hans Verkuil - Cisco Systems Norway - hverkuil(a)xs4all.nl * Javier Martinez Canillas - Samsung OSG * Tomasz Figa - Google - tfiga(a)chromium.org * Mauro Carvalho Chehab - Samsung OSG - mchehab(a)osg.samsung.com * David Howells - Red Hat - dhowells(a)redhat.com * Seung-Woo Kim - Samsung Software R&D Center - sw0312.kim(a)samsung.com * Inki Dae - Samsung Software R&D Center - inki.dae(a)samsung.com * Junghak Sung - Samsung Visual Display Business - jh1009.sung(a)samsung.com * Geunyoung Kim - Samsung Visual Display Business - nenggun.kim(a)samsung.com * Rany Kwon - Samsung Visual Display Business - rany.kwon(a)samsung.com * Minsong Kim - Samsung Visual Display Business - ms17.kim(a)samsung.com * Ikjoon Kim - Samsung Visual Display Business - ikjoon.kim(a)samsung.com * Thiago - Samsung OSG * Reynaldo - Samsung OSG * Luis de Bittencourt - Samsung OSG * Pawel Osciak - Google * Vinod Koul - Intel * Mark Brown - Linaro * Arnd Bergmann - Linaro 1. Pawel: Codec API: Stream API The original V4L2 codec API was developed along with the Exynos codec driver. As the device implements high-level operations in hardware the resulting API was high-level as well with drivers accepting unprocessed raw streams. This matches older ARM SoCs where CPU power wasn't deemed enough to implement stream parsing. Drivers implement two V4L2 buffer queues, one on the uncompressed side and one on the compressed side. The two queues operate independently, without a 1:1 correspondence between consumed and produced buffers (for instance reference frames need to be accumulated when starting video encoding before producing any output or bitstream header parsed before CAPTURE buffers can be allocated). The mem2mem V4L2 kernel framework thus can't be used to implement such codec drivers as it hardcodes this 1:1 correspondence. This is a kernel framework issue, not a V4L2 userspace API issue. (For stream API fundamentals see Pawel's slides) * Frame API (Slice API) CPUs are getting faster in the ARM world. The trend is to implement lower-level hardware codecs that require stream parsing on the CPU. CPU code needs to slice the stream, extract information, process them and pass the result to a shader-like device. This is the model used on Intel platforms and implemented in the VA API library. Drivers still implement two V4L2 buffer queues, but the encoded stream is split into frames of slices, and a large number of codec-specific controls need to be set from parsed stream information. Stream parsing and parameters calculation is better done in userspace. Userspace is responsible for managing reference frames and their life time, and for passing data to the codec in such a way that an input buffer wlil always produce an output buffer. The two queues operate together with a 1:1 correspondence between buffers. The mem2mem framework is thus usable. Sources buffer contain only slice data (macroblocks + coefficient data). Controls contain information extracted from stream parsing, list of reference frames and DPB (Decoded Picture Buffer). The request API can be used to associate controls with source buffers. Keeping references to reference frames is one of the remaining problems (especially with DMABUF, and possibly with MMAP in the future when we'll have the ability to destroy MMAP buffers while streaming). This problem also exists for the stream API. More discussion is needed to design a solution. Pawel promissed to upstream the ChromeOS codec drivers code this year (and you should be also nagging Tomasz to do it...). For encoders header generation should probably be done in userspace as well as the code is complex and doesn't require a kernel implementation. Userspace code should be implemented as libv4l2 plugins to interface between the frame API exposed by the kernel and a stream API exposed to applications. * Status See Pawel's slides. * Discussion points To be discussed on Tuesday at 11:30. References: Intel libVA SDK: https://bugs.freedesktop.org/show_bug.cgi?id=92533 Request API: https://lwn.net/Articles/641204/ Chromium Code (user): https://code.google.com/p/chromium/codesearch#chromium/src/content/common/g… 2: kABI kABI needs more review by devs. New kernel APIs need to be documented, adding e.g. new fields to undocumented structures doesn't require the submitter to document the full struct (although it obviously would be appreciated). Suggest to use kernel doc for 'top-level' documentation: drivers/gpu/drm/drm_atomic_helper.c (look for "DOC: overview") and Documentation/DocBook/drm.tmpl (look for "!Pdrivers/gpu/drm/drm_atomic_helper.c overview"). 3: uAPI for DVB * videobuf2 No DMABUF support at the moment: recommended that that's added, at the very least planned in the API and likely implemented too. Support for DVB output ('mem2mem demux') is also recommended (not necessary for the first version) Streamon/off is automatically called in the DVB API: should this be available as ioctl? No need seen for this. DVB framework needs to be extended to see whether userspace uses read() or stream I/O: V4L2 does this as well, so the same method should be used as V4L2. No need to add (or remove) buffers at runtime (à la CREATE_BUF) is foreseen. * SoC pipelines Samsung SoCs have full hardware pipelines from the tuner output to the screen without requiring any intervention at runtime. This requires connecting a DVB device to a V4L2 or DRM device. Hardware pipelines include hardware-configured scalers for seamless resolution change, in order to achieve real-time operation when the input resolution changes. 4. v4l2_buffer & Y2038 Should we create a new structure and fix several other issues in one go ? Yes. There might be a cache-related problem due to the way DMABUF is handled. DMABUF buffers are only unmapped when applications queue a different DMABUF fd on the same V4L2 buffer index. By that time the driver doesn't own access to the buffer but still tries to clean the cache. The root cause needs to be investigated. A related issue is how V4L2 keeps DMABUF mappings around for performance improvement. This prevents buffer eviction by the GPU. This should be discussed with DRM developers and dma-buf maintainers. Should we add support for sub-streams in a buffer ? Possibly for 3D capture, for other cases there's not so much interest. Use cases would be needed. Formats are specified for buffers and makes it difficult to transport meta-data in a plane along with image planes. Redesign of v4l2_buffer and v4l2_plane should take the use case into account. 5. poll() for output streams The current poll() behaviour is not usable for codecs. As mem2mem is considered as the main use case for output devices we need to optimize for that, and implement write emulation specific code in poll() as a special case. We'll revert to the old implementation and update the documentation accordingly. 6. poll for capture streams q->waiting_for_buffers is v4l2 specific, but after the vb2 split it is now part of the vb2 core: should this be moved to the v4l2 part or be kept in the vb2 core? After discussing this the opinion is that we should make this v4l2 specific and allow DVB (and other subsystems) to use the standard behavior. Proposals are welcome on ways to make userspace select the 'waiting_for_buffers' behavior for V4L2 since it is awkward there as well (but needed for backwards compatibility) 7. CSC 8. CEC 9. REQUEST_BUFS: v4l2_format validation: expect that userspace calls TRY_FMT or similar to fill the format field, only use sizeimage field in drivers. 10. MC Look at being able to set a topology using 'cat file >/dev/mediaX' (idea from alsa): depends on the details of the proposed format. Atomic configuration updates across subsystems (MC for links, V4L2/ALSA for other parameters, ...) needs to be taken into account. For audio devices routing changes ordering matters unless the hardware can apply routing changes atomically. 11. VIDIOC_SUBDEV_QUERYCAP Suggestion: MEDIA_IOC_INTERFACE_INFO: check that it is easy to implement in various subsystems (dvb, alsa, drm, iio) 12. DELETE_BUFFERS Yes, we'd like to have it. Ditto for more than 32 buffers (don't limit this). 13. Workshop format If we have two days available, then post a CFP to various mailinglists (including apps like gstreamer). Co-locate with alsa workshop.

2 1

Updated agenda
by Hans Verkuil 26 Oct '15

26 Oct '15

Hi all, A late (small) change: The break was moved up by 30 min since Shuah's talk moved up by the same amount. Regards, Hans ----------------------------------------------------------- Draft agenda for the media workshop October 26, 2015, Seoul, South Korea Room: TBD Please be on time! We start at 9 am, we have a full agenda, so we want to make good use of the time. 9:00-9:15: Get laptops hooked up, the projector running, wireless configured, your coffee cup filled, etc. etc. :-) 9:15-9:30: Hans: Introduction 9:30-10:15: Pawel: Update on codec APIs 10:15-10:30: Mauro: kABI documentation improvements 10:30-11:45: Break Allows time for attending Shuah's talk: http://korealinuxforum2015.sched.org/event/f59175cc49f866dbc9bebc36f86fe663… 11:45-12:15: Junghak: new uAPI for DVB to use streaming I/O 12:15-13:00: Hans: Should we replace v4l2_buffer with a new struct that is y2038-safe and that can be cleaned up and extended? (Think proper support for HW timestamps, etc.). See: https://patchwork.linuxtv.org/patch/31413/ And perhaps use this redesign to add support for multiple streams over one video node? I saw an example where the HW combines two streams into one, basically an m2m device, but today you'd need three nodes: two out and one capture in order to implement this. 13:00-14:30: Lunch 14:30-14:45: Hans: Proposal for adding support for HW colorspace conversion. 14:45-15:00: Hans: poll() behavior for output streams. 15:00-15:15: Hans: Status update of the CEC framework patch series. 15:15-16:00: Hans: Should the v4l2 core just call try_format to validate the format passed in by VIDIOC_CREATE_BUFFERS? Few drivers validate the format and if they do they usually do only partial validation. It's unclear what should happen here. Always calling try_format would also help the vb2 core code. Also discuss DELETE_BUFFERS. 16:00-16:15: Break 16:15-16:30: Mauro: Status update MC discussions: very tentative, and I'm just listing the topics without scheduling them and in no particular order: Mauro: Discuss dynamic subtree removal. The workshop might be too soon to discuss this. Hans: How to implement VIDIOC_SUBDEV_QUERYCAP? (15 min) Shuah: ENT_F_IO appears to be too generic, requiring additional steps to determine what kind of IO function it is really is. I propose preserving and allowing enough uniqueness to enable drivers to tag the functions when they create them. For example, if AUDIO functions are all tagged ENT_F_IO, bridge driver has to determine what kind of IO it really is. This requires finding the Interface entity associated with the function entity or comparing entity name strings. Instead, if a function can be tagged as Audio Capture when it gets created, these additional steps aren't necessary. I estimate 15 min for this topic if we need this. Shuah: Discuss snd-usb-audio control interface mapping to media. snd-usb-audio creates a control device file which could be exposed in a media graph. In some cases, it is a simple mixer control. Expose ENT_F_MIXER entity with an associated interface node MEDIA_INTF_T_ALSA_CONTROL 17:30-17:45: Hans: Discuss future improvements to the workshop format. Right now (as is clear from this schedule) the discussions are very technical, which makes it hard for non-core developers to attend. Perhaps we should do a split format: a half or full day of status updates, discussions to improve application integration, followed by core-developer-only discussions. Regards, Hans

3 2

Skystar S950 on Gentoo Linux 4.0.5 with latest media_build git
by Tamer Higazi 25 Oct '15

25 Oct '15

Hi people, Finally I managed it to compile the media_build" Skystar S950 board. http://git.linuxtv.org/cgit.cgi/media_build.git/about/ and compied the producers firmware in the "/lib/firmware" folder. I am on: Linux tux 4.0.5-gentoo #1 SMP Sat Oct 24 21:49:51 CEST 2015 x86_64 Intel(R) Core(TM)2 Quad CPU Q6600 @ 2.40GHz GenuineIntel GNU/Linux What I have figured out that far is that the drivers are loaded successfully in the kernel, but "/dev/dvb" still don't exist. Is the board not fully supported as the producer mentioned ? lspci -v: http://pastebin.com/raw.php?i=1p1K8ge7 lsmod: http://pastebin.com/raw.php?i=GeNNB0xc dmesg: http://pastebin.com/raw.php?i=a9fedCva kernel config: http://pastebin.com/raw.php?i=tTXzz0YA If any of you have a clue what I did wrong, I am happy to hear more about you that might solve my problem to get this board to run. best, Tamer

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

media-workshop