[media] media: au0828 add enable, disable source handlers
authorShuah Khan <shuahkh@osg.samsung.com>
Thu, 11 Feb 2016 23:41:35 +0000 (21:41 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sat, 27 Feb 2016 12:29:20 +0000 (09:29 -0300)
Add enable_source and disable_source handlers. The enable source handler
is called from v4l2-core, dvb-core, and ALSA drivers to check if the
shared media source is free.

The disable source handler is called to release the shared media
source.

[mchehab@osg.samsung.com: fix merge conflicts]

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/au0828/au0828-core.c
drivers/media/usb/au0828/au0828-video.c
drivers/media/usb/au0828/au0828.h

index 4ec7c573b5f190be40694a92b4e45e84056b4152..ca1e5ebf3b6b6c3df07e126bd87ee2c8a77b10eb 100644 (file)
@@ -232,6 +232,203 @@ static void au0828_media_graph_notify(struct media_entity *new,
 #endif
 }
 
+static int au0828_enable_source(struct media_entity *entity,
+                               struct media_pipeline *pipe)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+       struct media_entity  *source, *find_source;
+       struct media_entity *sink;
+       struct media_link *link, *found_link = NULL;
+       int ret = 0;
+       struct media_device *mdev = entity->graph_obj.mdev;
+       struct au0828_dev *dev;
+
+       if (!mdev)
+               return -ENODEV;
+
+       mutex_lock(&mdev->graph_mutex);
+
+       dev = mdev->source_priv;
+
+       /*
+        * For Audio and V4L2 entity, find the link to which decoder
+        * is the sink. Look for an active link between decoder and
+        * source (tuner/s-video/Composite), if one exists, nothing
+        * to do. If not, look for any  active links between source
+        * and any other entity. If one exists, source is busy. If
+        * source is free, setup link and start pipeline from source.
+        * For DVB FE entity, the source for the link is the tuner.
+        * Check if tuner is available and setup link and start
+        * pipeline.
+       */
+       if (entity->function == MEDIA_ENT_F_DTV_DEMOD) {
+               sink = entity;
+               find_source = dev->tuner;
+       } else {
+               /* Analog isn't configured or register failed */
+               if (!dev->decoder) {
+                       ret = -ENODEV;
+                       goto end;
+               }
+
+               sink = dev->decoder;
+
+               /*
+                * Default input is tuner and default input_type
+                * is AU0828_VMUX_TELEVISION.
+                * FIXME:
+                * There is a problem when s_input is called to
+                * change the default input. s_input will try to
+                * enable_source before attempting to change the
+                * input on the device, and will end up enabling
+                * default source which is tuner.
+                *
+                * Additional logic is necessary in au0828
+                * to detect that the input has changed and
+                * enable the right source.
+               */
+
+               if (dev->input_type == AU0828_VMUX_TELEVISION)
+                       find_source = dev->tuner;
+               else if (dev->input_type == AU0828_VMUX_SVIDEO ||
+                        dev->input_type == AU0828_VMUX_COMPOSITE)
+                       find_source = &dev->input_ent[dev->input_type];
+               else {
+                       /* unknown input - let user select input */
+                       ret = 0;
+                       goto end;
+               }
+       }
+
+       /* Is an active link between sink and source */
+       if (dev->active_link) {
+               /*
+                * If DVB is using the tuner and calling entity is
+                * audio/video, the following check will be false,
+                * since sink is different. Result is Busy.
+                */
+               if (dev->active_link->sink->entity == sink &&
+                   dev->active_link->source->entity == find_source) {
+                       /*
+                        * Either ALSA or Video own tuner. sink is
+                        * the same for both. Prevent Video stepping
+                        * on ALSA when ALSA owns the source.
+                       */
+                       if (dev->active_link_owner != entity &&
+                           dev->active_link_owner->function ==
+                                               MEDIA_ENT_F_AUDIO_CAPTURE) {
+                               pr_debug("ALSA has the tuner\n");
+                               ret = -EBUSY;
+                               goto end;
+                       }
+                       ret = 0;
+                       goto end;
+               } else {
+                       ret = -EBUSY;
+                       goto end;
+               }
+       }
+
+       list_for_each_entry(link, &sink->links, list) {
+               /* Check sink, and source */
+               if (link->sink->entity == sink &&
+                   link->source->entity == find_source) {
+                       found_link = link;
+                       break;
+               }
+       }
+
+       if (!found_link) {
+               ret = -ENODEV;
+               goto end;
+       }
+
+       /* activate link between source and sink and start pipeline */
+       source = found_link->source->entity;
+       ret = __media_entity_setup_link(found_link, MEDIA_LNK_FL_ENABLED);
+       if (ret) {
+               pr_err("Activate tuner link %s->%s. Error %d\n",
+                       source->name, sink->name, ret);
+               goto end;
+       }
+
+       ret = __media_entity_pipeline_start(entity, pipe);
+       if (ret) {
+               pr_err("Start Pipeline: %s->%s Error %d\n",
+                       source->name, entity->name, ret);
+               ret = __media_entity_setup_link(found_link, 0);
+               pr_err("Deactivate link Error %d\n", ret);
+               goto end;
+       }
+       /*
+        * save active link and active link owner to avoid audio
+        * deactivating video owned link from disable_source and
+        * vice versa
+       */
+       dev->active_link = found_link;
+       dev->active_link_owner = entity;
+       dev->active_source = source;
+       dev->active_sink = sink;
+
+       pr_debug("Enabled Source: %s->%s->%s Ret %d\n",
+                dev->active_source->name, dev->active_sink->name,
+                dev->active_link_owner->name, ret);
+end:
+       mutex_unlock(&mdev->graph_mutex);
+       pr_debug("au0828_enable_source() end %s %d %d\n",
+                entity->name, entity->function, ret);
+       return ret;
+#endif
+       return 0;
+}
+
+static void au0828_disable_source(struct media_entity *entity)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+       int ret = 0;
+       struct media_device *mdev = entity->graph_obj.mdev;
+       struct au0828_dev *dev;
+
+       if (!mdev)
+               return;
+
+       mutex_lock(&mdev->graph_mutex);
+       dev = mdev->source_priv;
+
+       if (!dev->active_link) {
+               ret = -ENODEV;
+               goto end;
+       }
+
+       /* link is active - stop pipeline from source (tuner) */
+       if (dev->active_link->sink->entity == dev->active_sink &&
+           dev->active_link->source->entity == dev->active_source) {
+               /*
+                * prevent video from deactivating link when audio
+                * has active pipeline
+               */
+               if (dev->active_link_owner != entity)
+                       goto end;
+               __media_entity_pipeline_stop(entity);
+               ret = __media_entity_setup_link(dev->active_link, 0);
+               if (ret)
+                       pr_err("Deactivate link Error %d\n", ret);
+
+               pr_debug("Disabled Source: %s->%s->%s Ret %d\n",
+                        dev->active_source->name, dev->active_sink->name,
+                        dev->active_link_owner->name, ret);
+
+               dev->active_link = NULL;
+               dev->active_link_owner = NULL;
+               dev->active_source = NULL;
+               dev->active_sink = NULL;
+       }
+
+end:
+       mutex_unlock(&mdev->graph_mutex);
+#endif
+}
+
 static int au0828_media_device_register(struct au0828_dev *dev,
                                        struct usb_device *udev)
 {
@@ -262,6 +459,10 @@ static int au0828_media_device_register(struct au0828_dev *dev,
                        ret);
                return ret;
        }
+       /* set enable_source */
+       dev->media_dev->source_priv = (void *) dev;
+       dev->media_dev->enable_source = au0828_enable_source;
+       dev->media_dev->disable_source = au0828_disable_source;
 #endif
        return 0;
 }
index 5c51e3766d4742384e61593a0e142debd6bb93aa..25e27c86e9ca55aa4769f0f3b5fadc5635dba424 100644 (file)
@@ -684,6 +684,7 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
                return -EINVAL;
 
        if (tuner) {
+               dev->tuner = tuner;
                ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,
                                            decoder, AU8522_PAD_INPUT, 0);
                if (ret)
index c2801b2a545dafd2ff02a156904f3ead480d3bd3..ff7f8510fb77ad633e97bbb55e946bcffe02fdac 100644 (file)
@@ -283,6 +283,11 @@ struct au0828_dev {
        struct media_entity input_ent[AU0828_MAX_INPUT];
        struct media_pad input_pad[AU0828_MAX_INPUT];
        struct media_entity_notify entity_notify;
+       struct media_entity *tuner;
+       struct media_link *active_link;
+       struct media_entity *active_link_owner;
+       struct media_entity *active_source;
+       struct media_entity *active_sink;
 #endif
 };