[PATCH 26/31] sound/usb: Update ALSA driver to use Managed Media Controller API
Change ALSA driver to use Managed Media Managed Controller
API to share tuner with DVB and V4L2 drivers that control
AU0828 media device. Media device is created based on a
newly added field value in the struct snd_usb_audio_quirk.
Using this approach, the media controller API usage can be
added for a specific device. In this patch, Media Controller
API is enabled for AU0828 hw. snd_usb_create_quirk() will
check this new field, if set will create a media device using
media_device_get_devres() interface.
media_device_get_devres() will allocate a new media device
devres or return an existing one, if it finds one.
During probe, media usb driver could have created the media
device devres. It will then initialze (if necessary) and
register the media device if it isn't already initialized
and registered. Media device unregister is done from
usb_audio_disconnect().
During probe, media usb driver could have created the
media device devres. It will then register the media
device if it isn't already registered. Media device
unregister is done from usb_audio_disconnect().
New structure media_ctl is added to group the new
fields to support media entity and links. This new
structure is added to struct snd_usb_substream.
A new entity_notify hook and a new ALSA capture media
entity are registered from snd_usb_pcm_open() after
setting up hardware information for the PCM device.
When a new entity is registered, Media Controller API
interface media_device_register_entity() invokes all
registered entity_notify hooks for the media device.
ALSA entity_notify hook parses all the entity list to
find a link from decoder it ALSA entity. This indicates
that the bridge driver created a link from decoder to
ALSA capture entity.
ALSA will attempt to enable the tuner to link the tuner
to the decoder calling enable_source handler if one is
provided by the bridge driver prior to starting Media
pipeline from snd_usb_hw_params(). If enable_source returns
with tuner busy condition, then snd_usb_hw_params() will fail
with -EBUSY. Media pipeline is stopped from snd_usb_hw_free().
Signed-off-by: Shuah Khan
---
sound/usb/Makefile | 15 +++-
sound/usb/card.c | 7 ++
sound/usb/card.h | 1 +
sound/usb/media.c| 214 +++
sound/usb/media.h| 54
sound/usb/pcm.c | 26 --
sound/usb/quirks-table.h | 1 +
sound/usb/quirks.c | 9 +-
sound/usb/stream.c | 2 +
sound/usb/usbaudio.h | 1 +
10 files changed, 323 insertions(+), 7 deletions(-)
create mode 100644 sound/usb/media.c
create mode 100644 sound/usb/media.h
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 2d2d122..665fdd9 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -2,6 +2,18 @@
# Makefile for ALSA
#
+# Media Controller
+ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
+ ifeq ($(CONFIG_MEDIA_SUPPORT),y)
+KBUILD_CFLAGS += -DUSE_MEDIA_CONTROLLER
+ endif
+ ifeq ($(CONFIG_MEDIA_SUPPORT_MODULE),y)
+ifeq ($(MODULE),y)
+ KBUILD_CFLAGS += -DUSE_MEDIA_CONTROLLER
+endif
+ endif
+endif
+
snd-usb-audio-objs := card.o \
clock.o \
endpoint.o \
@@ -13,7 +25,8 @@ snd-usb-audio-objs := card.o \
pcm.o \
proc.o \
quirks.o \
- stream.o
+ stream.o \
+ media.o
snd-usbmidi-lib-objs := midi.o
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 18f5664..1a63851 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -66,6 +66,7 @@
#include "format.h"
#include "power.h"
#include "stream.h"
+#include "media.h"
MODULE_AUTHOR("Takashi Iwai ");
MODULE_DESCRIPTION("USB Audio");
@@ -621,6 +622,12 @@ static void usb_audio_disconnect(struct usb_interface
*intf)
list_for_each_entry(mixer, &chip->mixer_list, list) {
snd_usb_mixer_disconnect(mixer);
}
+ /*
+* Nice to check quirk && quirk->media_device
+* need some special handlings. Doesn't look like
+* we have access to quirk here
+ */
+ media_device_delete(intf);
}
chip->num_interfaces--;
diff --git a/sound/usb/card.h b/sound/usb/card.h
index 71778ca..c15a03c 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -156,6 +156,7 @@ struct snd_usb_substream {
} dsd_dop;
bool trigger_tstamp_pending_update; /* trigger timestamp being updated
from initial estimate */
+ void *media_ctl;
};
struct snd_usb_stream {
diff --git a/sound/usb/media.c b/sound/usb/media.c
new file mode 100644
index 000..747a66a
--- /dev/null
+++ b/sound/usb/media.c
@@ -0,0 +1,214 @@
+/*
+ * media.c - Media Controller specific ALSA driver code
+ *
+ * Copyright (c) 2015 Shuah Khan
+ * Copyright (c) 2015 Samsung Electronics
Re: [PATCH 26/31] sound/usb: Update ALSA driver to use Managed Media Controller API
On Wed, 06 Jan 2016 22:05:35 +0100,
Shuah Khan wrote:
>
> diff --git a/sound/usb/Makefile b/sound/usb/Makefile
> index 2d2d122..665fdd9 100644
> --- a/sound/usb/Makefile
> +++ b/sound/usb/Makefile
> @@ -2,6 +2,18 @@
> # Makefile for ALSA
> #
>
> +# Media Controller
> +ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
> + ifeq ($(CONFIG_MEDIA_SUPPORT),y)
> +KBUILD_CFLAGS += -DUSE_MEDIA_CONTROLLER
> + endif
> + ifeq ($(CONFIG_MEDIA_SUPPORT_MODULE),y)
> +ifeq ($(MODULE),y)
> + KBUILD_CFLAGS += -DUSE_MEDIA_CONTROLLER
> +endif
> + endif
> +endif
Can't we define this rather via Kconfig?
Doing this in Makefile is way too tricky, and it's unclear to users
whether MC is actually enabled or not.
> diff --git a/sound/usb/media.c b/sound/usb/media.c
> new file mode 100644
> index 000..747a66a
> --- /dev/null
> +++ b/sound/usb/media.c
> @@ -0,0 +1,214 @@
> +/*
> + * media.c - Media Controller specific ALSA driver code
> + *
> + * Copyright (c) 2015 Shuah Khan
> + * Copyright (c) 2015 Samsung Electronics Co., Ltd.
> + *
> + * This file is released under the GPLv2.
> + */
> +
> +/*
> + * This file adds Media Controller support to ALSA driver
> + * to use the Media Controller API to share tuner with DVB
> + * and V4L2 drivers that control media device. Media device
> + * is created based on existing quirks framework. Using this
> + * approach, the media controller API usage can be added for
> + * a specific device.
> +*/
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include "usbaudio.h"
> +#include "card.h"
> +#include "midi.h"
> +#include "mixer.h"
> +#include "proc.h"
> +#include "quirks.h"
> +#include "endpoint.h"
> +#include "helper.h"
> +#include "debug.h"
> +#include "pcm.h"
> +#include "format.h"
> +#include "power.h"
> +#include "stream.h"
> +#include "media.h"
I believe we can get rid of many include files just for MC support...
> +#ifdef USE_MEDIA_CONTROLLER
This ifdef can be removed once if we build this object file
conditionally in Makefile.
> @@ -1232,7 +1244,10 @@ static int snd_usb_pcm_open(struct snd_pcm_substream
> *substream, int direction)
> subs->dsd_dop.channel = 0;
> subs->dsd_dop.marker = 1;
>
> - return setup_hw_info(runtime, subs);
> + ret = setup_hw_info(runtime, subs);
> + if (ret == 0)
> + ret = media_stream_init(subs, as->pcm, direction);
Need to call snd_usb_autosuspend() in the error path.
> --- a/sound/usb/quirks.c
> +++ b/sound/usb/quirks.c
> @@ -544,13 +545,19 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
> [QUIRK_AUDIO_ALIGN_TRANSFER] = create_align_transfer_quirk,
> [QUIRK_AUDIO_STANDARD_MIXER] = create_standard_mixer_quirk,
> };
> + int ret;
>
> + if (quirk->media_device) {
> + /* don't want to fail when media_device_create() fails */
> + media_device_create(chip, iface);
> + }
So far, so good...
> if (quirk->type < QUIRK_TYPE_COUNT) {
> - return quirk_funcs[quirk->type](chip, iface, driver, quirk);
> + ret = quirk_funcs[quirk->type](chip, iface, driver, quirk);
> } else {
> usb_audio_err(chip, "invalid quirk type %d\n", quirk->type);
> return -ENXIO;
> }
> + return ret;
Any reason to change this?
Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
