mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
To: Shuah Khan <shuahkh@osg.samsung.com>
Cc: tiwai@suse.com, clemens@ladisch.de, hans.verkuil@cisco.com,
	laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com,
	javier@osg.samsung.com, pawel@osciak.com,
	m.szyprowski@samsung.com, kyungmin.park@samsung.com,
	perex@perex.cz, arnd@arndb.de, dan.carpenter@oracle.com,
	tvboxspy@gmail.com, crope@iki.fi, ruchandani.tina@gmail.com,
	corbet@lwn.net, chehabrafael@gmail.com, k.kozlowski@samsung.com,
	stefanr@s5r6.in-berlin.de, inki.dae@samsung.com,
	jh1009.sung@samsung.com, elfring@users.sourceforge.net,
	prabhakar.csengg@gmail.com, sw0312.kim@samsung.com,
	p.zabel@pengutronix.de, ricardo.ribalda@gmail.com,
	labbott@fedoraproject.org, pierre-louis.bossart@linux.intel.com,
	ricard.wanderlof@axis.com, julian@jusst.de,
	takamichiho@gmail.com, dominic.sacre@gmx.de, misterpib@gmail.com,
	daniel@zonque.org, gtmkramer@xs4all.nl, normalperson@yhbt.net,
	joe@oampo.co.uk, linuxbugs@vittgam.net, johan@oljud.se,
	linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
	linux-api@vger.kernel.org, alsa-devel@alsa-project.org
Subject: Re: [PATCH 23/31] media: au0828 implement enable_source and disable_source handlers
Date: Thu, 28 Jan 2016 14:43:32 -0200	[thread overview]
Message-ID: <20160128144332.39dc8b4b@recife.lan> (raw)
In-Reply-To: <6d1f10b616fc3c8b016cf0e335de569012400de8.1452105878.git.shuahkh@osg.samsung.com>

Em Wed,  6 Jan 2016 13:27:12 -0700
Shuah Khan <shuahkh@osg.samsung.com> escreveu:

> Implements enable_source and disable_source handlers for other
> drivers (v4l2-core, dvb-core, and ALSA) to use to check for
> tuner connected to the decoder and activate the link if tuner
> is free, and deactivate and free the tuner when it is no longer
> needed.
> 
> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> ---
>  drivers/media/usb/au0828/au0828-core.c | 148 +++++++++++++++++++++++++++++++++
>  drivers/media/usb/au0828/au0828.h      |   2 +
>  2 files changed, 150 insertions(+)
> 
> diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
> index a15a61a..f8d2db3 100644
> --- a/drivers/media/usb/au0828/au0828-core.c
> +++ b/drivers/media/usb/au0828/au0828-core.c
> @@ -370,6 +370,150 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
>  	return 0;
>  }
>  
> +static int au0828_enable_source(struct media_entity *entity,
> +				struct media_pipeline *pipe)
> +{

The best would be to put those enable source stuff at the core, in a way
that other drivers could share it.

Not sure about the implementation, as this requires testing ;)
Did you consider the cases where the source connector is S-Video
or Composite?

> +#ifdef CONFIG_MEDIA_CONTROLLER
> +	struct media_entity  *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;
> +
> +	/* for Audio and Video entities, source is the decoder */
> +	mutex_lock(&mdev->graph_mutex);
> +
> +	dev = mdev->source_priv;
> +	if (!dev->tuner || !dev->decoder) {
> +		ret = -ENODEV;
> +		goto end;
> +	}
> +
> +	/*
> +	 * For Audio and V4L2 entity, find the link to which decoder
> +	 * is the sink. Look for an active link between decoder and
> +	 * tuner, if one exists, nothing to do. If not, look for any
> +	 * active links between tuner and any other entity. If one
> +	 * exists, tuner is busy. If tuner is free, setup link and
> +	 * start pipeline from source (tuner).
> +	 * 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 = dev->decoder;
> +	else
> +		sink = entity;
> +
> +	/* Is an active link between sink and tuner */
> +	if (dev->active_link) {
> +		if (dev->active_link->sink->entity == sink &&
> +		    dev->active_link->source->entity == dev->tuner) {
> +			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 == dev->tuner) {
> +			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("Deactive 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;
> +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
> +	struct media_entity *sink;
> +	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->tuner || !dev->decoder || !dev->active_link) {
> +		ret = -ENODEV;
> +		goto end;
> +	}
> +
> +	if (entity->function != MEDIA_ENT_F_DTV_DEMOD)
> +		sink = dev->decoder;
> +	else
> +		sink = entity;
> +
> +	/* link is active - stop pipeline from source (tuner) */
> +	if (dev->active_link && dev->active_link->sink->entity == sink &&
> +	    dev->active_link->source->entity == dev->tuner) {
> +		/*
> +		 * 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("Deactive link Error %d\n", ret);
> +		dev->active_link = NULL;
> +		dev->active_link_owner = NULL;
> +	}
> +
> +end:
> +	mutex_unlock(&mdev->graph_mutex);
> +#endif
> +}
> +
>  static int au0828_media_device_register(struct au0828_dev *dev,
>  					struct usb_device *udev)
>  {
> @@ -400,6 +544,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;
>  }
> diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
> index cfb6d58..3707664 100644
> --- a/drivers/media/usb/au0828/au0828.h
> +++ b/drivers/media/usb/au0828/au0828.h
> @@ -289,6 +289,8 @@ struct au0828_dev {
>  	bool vdev_linked;
>  	bool vbi_linked;
>  	bool audio_capture_linked;
> +	struct media_link *active_link;
> +	struct media_entity *active_link_owner;
>  #endif
>  };
>  

  reply	other threads:[~2016-01-28 16:43 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-06 20:26 [PATCH 00/31] Sharing media resources across ALSA and au0828 drivers Shuah Khan
2016-01-06 20:26 ` [PATCH 01/31] uapi/media.h: Declare interface types for ALSA Shuah Khan
2016-01-28 14:59   ` Mauro Carvalho Chehab
2016-02-01 16:07     ` Shuah Khan
2016-02-01 16:18       ` Takashi Iwai
2016-02-01 17:04         ` Shuah Khan
2016-01-06 20:26 ` [PATCH 02/31] media: Add ALSA Media Controller function entities Shuah Khan
2016-01-28 15:02   ` Mauro Carvalho Chehab
2016-01-06 20:26 ` [PATCH 03/31] media: Media Controller register/unregister entity_notify API Shuah Khan
2016-01-28 15:13   ` Mauro Carvalho Chehab
2016-01-28 17:09     ` Shuah Khan
2016-01-06 20:26 ` [PATCH 04/31] media: Media Controller enable/disable source handler API Shuah Khan
2016-01-28 15:19   ` Mauro Carvalho Chehab
2016-01-28 16:28     ` Shuah Khan
2016-01-28 17:15       ` Mauro Carvalho Chehab
2016-01-28 20:33         ` Shuah Khan
2016-01-06 20:26 ` [PATCH 05/31] media: Media Controller fix to not let stream_count go negative Shuah Khan
2016-01-06 20:26 ` [PATCH 06/31] media: Media Controller export non locking __media_entity_setup_link() Shuah Khan
2016-01-06 20:26 ` [PATCH 07/31] media: Media Controller non-locking __media_entity_pipeline_start/stop() Shuah Khan
2016-01-06 20:26 ` [PATCH 08/31] media: v4l-core add v4l_enable/disable_media_tuner() helper functions Shuah Khan
2016-01-28 15:26   ` Mauro Carvalho Chehab
2016-01-28 17:12     ` Shuah Khan
2016-01-06 20:26 ` [PATCH 09/31] media: v4l2-core add v4l_vb2q_enable_media_tuner() helper Shuah Khan
2016-01-28 15:29   ` Mauro Carvalho Chehab
2016-01-28 17:31     ` Shuah Khan
2016-01-28 17:34       ` Mauro Carvalho Chehab
2016-01-06 20:26 ` [PATCH 10/31] media: Move au8522_media_pads enum to au8522.h from au8522_priv.h Shuah Khan
2016-01-06 20:27 ` [PATCH 11/31] media: au8522 change to create MC pad for ALSA Audio Out Shuah Khan
2016-01-06 20:27 ` [PATCH 12/31] media: au0828 Use au8522_media_pads enum for pad defines Shuah Khan
2016-01-06 20:27 ` [PATCH 13/31] media: au0828 fix au0828_create_media_graph() entity checks Shuah Khan
2016-01-28 15:37   ` Mauro Carvalho Chehab
2016-01-28 18:57     ` Shuah Khan
2016-01-06 20:27 ` [PATCH 14/31] media: Change v4l-core to check for tuner availability Shuah Khan
2016-01-06 20:27 ` [PATCH 15/31] media: dvb-frontend invoke enable/disable_source handlers Shuah Khan
2016-01-28 15:53   ` Mauro Carvalho Chehab
2016-01-28 16:07     ` One Thousand Gnomes
2016-01-28 16:59       ` Shuah Khan
2016-01-28 17:31         ` Mauro Carvalho Chehab
2016-01-06 20:27 ` [PATCH 16/31] media: au0828 video remove au0828_enable_analog_tuner() Shuah Khan
2016-01-06 20:27 ` [PATCH 17/31] media: au0828 video change to use v4l_enable_media_tuner() Shuah Khan
2016-01-28 15:57   ` Mauro Carvalho Chehab
2016-01-28 19:21     ` Shuah Khan
2016-01-28 19:33       ` Devin Heitmueller
2016-01-06 20:27 ` [PATCH 18/31] media: au0828 change to use Managed Media Controller API Shuah Khan
2016-01-06 20:27 ` [PATCH 19/31] media: au0828 handle media_init and media_register window Shuah Khan
2016-01-06 20:27 ` [PATCH 20/31] media: au0828 change to register/unregister entity_notify hook Shuah Khan
2016-01-28 16:36   ` Mauro Carvalho Chehab
2016-01-28 20:05     ` Shuah Khan
2016-01-28 20:20       ` Mauro Carvalho Chehab
2016-01-06 20:27 ` [PATCH 21/31] media: au0828 create tuner to decoder link in deactivated state Shuah Khan
2016-01-06 20:27 ` [PATCH 22/31] media: dvb-core create tuner to demod pad link in disabled state Shuah Khan
2016-01-28 16:38   ` Mauro Carvalho Chehab
2016-01-28 20:09     ` Shuah Khan
2016-01-06 20:27 ` [PATCH 23/31] media: au0828 implement enable_source and disable_source handlers Shuah Khan
2016-01-28 16:43   ` Mauro Carvalho Chehab [this message]
2016-01-28 20:14     ` Shuah Khan
2016-01-06 20:27 ` [PATCH 24/31] media: au0828 fix null pointer reference in au0828_create_media_graph() Shuah Khan
2016-01-28 16:44   ` Mauro Carvalho Chehab
2016-01-28 20:15     ` Shuah Khan
2016-01-06 20:27 ` [PATCH 28/31] media: au0828 create link between ALSA Mixer and decoder Shuah Khan
2016-01-28 16:58   ` Mauro Carvalho Chehab
2016-01-28 20:17     ` Shuah Khan
2016-01-06 20:27 ` [PATCH 29/31] media: track media device unregister in progress Shuah Khan
2016-01-28 17:01   ` Mauro Carvalho Chehab
2016-01-28 17:04     ` Shuah Khan
2016-01-28 17:28       ` Mauro Carvalho Chehab
2016-01-28 20:42         ` Shuah Khan
2016-02-03 19:32           ` Shuah Khan
2016-01-06 20:27 ` [PATCH 30/31] sound/usb: Check media device unregister progress state Shuah Khan
2016-01-06 20:27 ` [PATCH 31/31] media: au0828 change to check " Shuah Khan
2016-01-28 17:05   ` Mauro Carvalho Chehab
2016-01-28 20:31     ` Shuah Khan
2016-01-06 21:01 ` [PATCH 25/31] media: au0828 fix to not call media_device_unregister_entity_notify() Shuah Khan
2016-01-28 16:45   ` Mauro Carvalho Chehab
2016-01-28 20:15     ` Shuah Khan
2016-01-06 21:05 ` [PATCH 26/31] sound/usb: Update ALSA driver to use Managed Media Controller API Shuah Khan
2016-01-07 15:44   ` Takashi Iwai
2016-01-07 20:27     ` Shuah Khan
2016-01-06 21:05 ` [PATCH 27/31] sound/usb: Create media mixer function and control interface entities Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160128144332.39dc8b4b@recife.lan \
    --to=mchehab@osg.samsung.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=arnd@arndb.de \
    --cc=chehabrafael@gmail.com \
    --cc=clemens@ladisch.de \
    --cc=corbet@lwn.net \
    --cc=crope@iki.fi \
    --cc=dan.carpenter@oracle.com \
    --cc=daniel@zonque.org \
    --cc=dominic.sacre@gmx.de \
    --cc=elfring@users.sourceforge.net \
    --cc=gtmkramer@xs4all.nl \
    --cc=hans.verkuil@cisco.com \
    --cc=inki.dae@samsung.com \
    --cc=javier@osg.samsung.com \
    --cc=jh1009.sung@samsung.com \
    --cc=joe@oampo.co.uk \
    --cc=johan@oljud.se \
    --cc=julian@jusst.de \
    --cc=k.kozlowski@samsung.com \
    --cc=kyungmin.park@samsung.com \
    --cc=labbott@fedoraproject.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linuxbugs@vittgam.net \
    --cc=m.szyprowski@samsung.com \
    --cc=misterpib@gmail.com \
    --cc=normalperson@yhbt.net \
    --cc=p.zabel@pengutronix.de \
    --cc=pawel@osciak.com \
    --cc=perex@perex.cz \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=prabhakar.csengg@gmail.com \
    --cc=ricard.wanderlof@axis.com \
    --cc=ricardo.ribalda@gmail.com \
    --cc=ruchandani.tina@gmail.com \
    --cc=sakari.ailus@linux.intel.com \
    --cc=shuahkh@osg.samsung.com \
    --cc=stefanr@s5r6.in-berlin.de \
    --cc=sw0312.kim@samsung.com \
    --cc=takamichiho@gmail.com \
    --cc=tiwai@suse.com \
    --cc=tvboxspy@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome