August 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v3 0/9] asoc: Add audio for sti platforms
by Arnaud Pouliquen 09 Sep '15

09 Sep '15

version 3 : - patch dependency: ASoC: simple card: set cpu-dai sysclk with mclk-fs (Arnaud Pouliquen) - Remark not applied: Use Russell King's patch "sound/core: add IEC958 channel status helper". => This allows to create settings based on runtime, but not compatible with iec958 controls exposed to userland (settings overwritten by snd_pcm_create_iec958_consumer) - main corrections: - rework DAI CPU declaration to use generic dma - Supress abstraction layer for uniperiph player/reader - use dapm for DAC powerup/down version 2: corrections after first review - bindings: . suppress useless dts declaration - uniperif_player.c: . Suppress standby mode in uniplayer ( will be part of a dedicated patch) . Deliver IEC and clock adjustement controls in separate patch - uniperif_reader.c: . kept as separate file as behavior and feature not same than uniplayer . minor corrections - codec/sti-sas.c . implement DAPM for DAC . rework registers declaration to separate device and driver part version 1: - First patches submission Arnaud Pouliquen (9): ASoC: sti: add binding for ASoC driver ASoC: sti: Add uniperipheral header file ASoC: sti: Add CPU DAI driver for playback ASoC: sti: Add CPU DAI driver for capture ASoC: sti: Add uniperipheral dai driver ASoC: Add ability to build sti drivers ASoC: Codec: Add sti platform codec ASoC: sti: Add clock adjustement control ASoC: sti: Add IEC control .../devicetree/bindings/sound/st,sti-asoc-card.txt | 155 +++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sti-sas.c | 627 ++++++++++ sound/soc/sti/Kconfig | 11 + sound/soc/sti/Makefile | 4 + sound/soc/sti/sti_uniperif.c | 254 ++++ sound/soc/sti/uniperif.h | 1229 ++++++++++++++++++++ sound/soc/sti/uniperif_player.c | 1109 ++++++++++++++++++ sound/soc/sti/uniperif_reader.c | 364 ++++++ 12 files changed, 3762 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt create mode 100644 sound/soc/codecs/sti-sas.c create mode 100644 sound/soc/sti/Kconfig create mode 100644 sound/soc/sti/Makefile create mode 100644 sound/soc/sti/sti_uniperif.c create mode 100644 sound/soc/sti/uniperif.h create mode 100644 sound/soc/sti/uniperif_player.c create mode 100644 sound/soc/sti/uniperif_reader.c -- 1.9.1

4 27

[alsa-devel] [PATCH] ALSA: usb-audio: Recurse before saving terminal properties
by Julian Scheel 06 Sep '15

06 Sep '15

When the descriptor parser recurses into the clock source descriptor, the terminals properties, like name and type, are set to the values of the clock selector as check_input_term overwrites term->name and others in the recursive call. As we want to only fill missing values using the descriptors higher in the recursion tree the properties taken from the actual descriptor must be applied after recursing. Signed-off-by: Julian Scheel <julian(a)jusst.de> --- sound/usb/mixer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 6b3acba..4a49944 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -715,15 +715,16 @@ static int check_input_term(struct mixer_build *state, int id, term->name = d->iTerminal; } else { /* UAC_VERSION_2 */ struct uac2_input_terminal_descriptor *d = p1; - term->type = le16_to_cpu(d->wTerminalType); - term->channels = d->bNrChannels; - term->chconfig = le32_to_cpu(d->bmChannelConfig); - term->name = d->iTerminal; /* call recursively to get the clock selectors */ err = check_input_term(state, d->bCSourceID, term); if (err < 0) return err; + + term->type = le16_to_cpu(d->wTerminalType); + term->channels = d->bNrChannels; + term->chconfig = le32_to_cpu(d->bmChannelConfig); + term->name = d->iTerminal; } return 0; case UAC_FEATURE_UNIT: { -- 2.5.0

4 7

[alsa-devel] Tascam US-366 and Alsa Firmware
by Burton Samograd 04 Sep '15

04 Sep '15

Hi, I recently bought the Tascam US-366 and forgot to check for Linux support, which it doesn't have (yet! :). Looking through the Alsa firmware sources, there seems to be a firmware loader called usx2yloader which supports a number of Tascam cards, but the US-366 is not listed. It looks like really usx2yloader just needs the firmware and a `prepad` file. I`ve found the firmware for the card (I think) buried in the OSX firmware download package: http://tascam.com/content/downloads/products/789/us-322_us-366_fw_v103_mave… Now I think I just need the prepad file, but there's little documentation regarding exactly what that is (I'm assuming a number of 0s just to pad the firmware image to alignment, but I'm not sure of what alignment). Any ideas if usx2yloader will work at all with the US-366? Does anyone know what the pre-pad file should be/contain? Has anyone tried to get the US-366 working yet and failed? Reference: http://tascam.com/product/us-366/ Thanks. Burton Samograd

2 2

[alsa-devel] Linux 4.2 ALSA snd-usb-audio inconsistent lock state warn in PCM nonatomic mode
by Shuah Khan 02 Sep '15

02 Sep '15

Hi Takashi, I am seeing the following inconsistent lock state warning when PCM is run in nonatomic mode. This is on 4.2.0 and with the following change to force PCM on nonatomic mode: diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 310a382..16bbb71 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -370,6 +370,7 @@ int snd_usb_add_audio_stream(struct snd_usb_audio *chip, pcm->private_data = as; pcm->private_free = snd_usb_audio_pcm_free; pcm->info_flags = 0; + pcm->nonatomic = true; if (chip->pcm_devs > 0) sprintf(pcm->name, "USB Audio #%d", chip->pcm_devs); else The device Bus 003 Device 002: ID 2040:7200 Hauppauge Please let me know if you need more information and any ideas on how to fix this problem. thanks, -- Shuah [ 120.283960] ================================= [ 120.283964] [ INFO: inconsistent lock state ] [ 120.283968] 4.2.0+ #29 Not tainted [ 120.283972] --------------------------------- [ 120.283975] inconsistent {HARDIRQ-ON-W} -> {IN-HARDIRQ-W} usage. [ 120.283980] swapper/1/0 [HC1[1]:SC0[0]:HE0:SE1] takes: [ 120.283983] (&(&subs->lock)->rlock){?.+...}, at: [<ffffffffa05ed210>] retire_capture_urb+0x140/0x2b0 [snd_usb_audio] [ 120.284005] {HARDIRQ-ON-W} state was registered at: [ 120.284008] [<ffffffff810af230>] __lock_acquire+0xc50/0x2380 [ 120.284016] [<ffffffff810b1631>] lock_acquire+0xb1/0x130 [ 120.284022] [<ffffffff817fd4a1>] _raw_spin_lock+0x31/0x40 [ 120.284028] [<ffffffffa05ee81d>] snd_usb_pcm_pointer+0x5d/0xc0 [snd_usb_audio] [ 120.284040] [<ffffffffa01c6498>] snd_pcm_update_hw_ptr0+0x38/0x3a0 [snd_pcm] [ 120.284052] [<ffffffffa01c73f0>] snd_pcm_update_hw_ptr+0x10/0x20 [snd_pcm] [ 120.284063] [<ffffffffa01beae5>] snd_pcm_hwsync+0x45/0xa0 [snd_pcm] [ 120.284071] [<ffffffffa01c1347>] snd_pcm_common_ioctl1+0x277/0xce0 [snd_pcm] [ 120.284081] [<ffffffffa01c227e>] snd_pcm_capture_ioctl1+0x1be/0x2d0 [snd_pcm] [ 120.284090] [<ffffffffa01c2444>] snd_pcm_capture_ioctl+0x34/0x40 [snd_pcm] [ 120.284100] [<ffffffff811ed7e1>] do_vfs_ioctl+0x301/0x560 [ 120.284107] [<ffffffff811edab9>] SyS_ioctl+0x79/0x90 [ 120.284112] [<ffffffff817fdf17>] entry_SYSCALL_64_fastpath+0x12/0x6f [ 120.284119] irq event stamp: 823304 [ 120.284122] hardirqs last enabled at (823301): [<ffffffff816707ad>] cpuidle_enter_state+0xed/0x230 [ 120.284129] hardirqs last disabled at (823302): [<ffffffff817fea28>] common_interrupt+0x68/0x6d [ 120.284135] softirqs last enabled at (823304): [<ffffffff81060351>] _local_bh_enable+0x21/0x50 [ 120.284139] softirqs last disabled at (823303): [<ffffffff810611ac>] irq_enter+0x4c/0x70 [ 120.284143] other info that might help us debug this: [ 120.284146] Possible unsafe locking scenario: [ 120.284149] CPU0 [ 120.284150] ---- [ 120.284152] lock(&(&subs->lock)->rlock); [ 120.284155] <Interrupt> [ 120.284157] lock(&(&subs->lock)->rlock); [ 120.284160] *** DEADLOCK *** [ 120.284163] no locks held by swapper/1/0. [ 120.284165] stack backtrace: [ 120.284170] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 4.2.0+ #29 [ 120.284173] Hardware name: Hewlett-Packard HP ProBook 6475b/180F, BIOS 68TTU Ver. F.04 08/03/2012 [ 120.284176] ffffffff828d5630 ffff88023ec83a68 ffffffff817f4ea0 0000000000000007 [ 120.284181] ffff880235a6a500 ffff88023ec83ac8 ffffffff810ad97f 0000000000000000 [ 120.284186] 0000000000000000 ffff880200000001 ffffffff810134df ffffffff827c5390 [ 120.284192] Call Trace: [ 120.284194] <IRQ> [<ffffffff817f4ea0>] dump_stack+0x45/0x57 [ 120.284203] [<ffffffff810ad97f>] print_usage_bug+0x1ff/0x210 [ 120.284209] [<ffffffff810134df>] ? save_stack_trace+0x2f/0x50 [ 120.284214] [<ffffffff810adffe>] mark_lock+0x66e/0x6f0 [ 120.284218] [<ffffffff810aceb0>] ? print_shortest_lock_dependencies+0x1d0/0x1d0 [ 120.284222] [<ffffffff810af3ab>] __lock_acquire+0xdcb/0x2380 [ 120.284226] [<ffffffff81091a2c>] ? __enqueue_entity+0x6c/0x70 [ 120.284230] [<ffffffff810ab8dd>] ? __lock_is_held+0x4d/0x70 [ 120.284234] [<ffffffff810ab8dd>] ? __lock_is_held+0x4d/0x70 [ 120.284238] [<ffffffff810ab8dd>] ? __lock_is_held+0x4d/0x70 [ 120.284242] [<ffffffff810ab8dd>] ? __lock_is_held+0x4d/0x70 [ 120.284246] [<ffffffff810b1631>] lock_acquire+0xb1/0x130 [ 120.284256] [<ffffffffa05ed210>] ? retire_capture_urb+0x140/0x2b0 [snd_usb_audio] [ 120.284261] [<ffffffff817fd61c>] _raw_spin_lock_irqsave+0x3c/0x50 [ 120.284270] [<ffffffffa05ed210>] ? retire_capture_urb+0x140/0x2b0 [snd_usb_audio] [ 120.284276] [<ffffffff81595325>] ? usb_hcd_get_frame_number+0x25/0x30 [ 120.284285] [<ffffffffa05ed210>] retire_capture_urb+0x140/0x2b0 [snd_usb_audio] [ 120.284294] [<ffffffffa05e513c>] snd_complete_urb+0x13c/0x250 [snd_usb_audio] [ 120.284298] [<ffffffff81592cb2>] __usb_hcd_giveback_urb+0x72/0x110 [ 120.284303] [<ffffffff81592e53>] usb_hcd_giveback_urb+0x43/0x140 [ 120.284307] [<ffffffff815d1b02>] xhci_irq+0xd42/0x1fc0 [ 120.284312] [<ffffffff815d2d91>] xhci_msi_irq+0x11/0x20 [ 120.284317] [<ffffffff810c4570>] handle_irq_event_percpu+0x80/0x1a0 [ 120.284322] [<ffffffff810c46da>] handle_irq_event+0x4a/0x70 [ 120.284325] [<ffffffff810c7794>] ? handle_edge_irq+0x24/0x150 [ 120.284329] [<ffffffff810c77f1>] handle_edge_irq+0x81/0x150 [ 120.284333] [<ffffffff81005c85>] handle_irq+0x25/0x40 [ 120.284337] [<ffffffff818008ef>] do_IRQ+0x4f/0xe0 [ 120.284341] [<ffffffff817fea2d>] common_interrupt+0x6d/0x6d [ 120.284343] <EOI> [<ffffffff816707b2>] ? cpuidle_enter_state+0xf2/0x230 [ 120.284351] [<ffffffff816707ad>] ? cpuidle_enter_state+0xed/0x230 [ 120.284355] [<ffffffff81670927>] cpuidle_enter+0x17/0x20 [ 120.284360] [<ffffffff810a3862>] call_cpuidle+0x32/0x60 [ 120.284364] [<ffffffff81670903>] ? cpuidle_select+0x13/0x20 [ 120.284369] [<ffffffff810a3aa6>] cpu_startup_entry+0x216/0x2d0 [ 120.284374] [<ffffffff8103679d>] start_secondary+0x12d/0x150 [ 125.426447] device: 'ep_84': device_unregister [ 125.426511] PM: Removing info for No Bus:ep_84 [ 125.426542] device: 'ep_84': device_add [ 125.426602] PM: Adding info for No Bus:ep_84 -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh(a)osg.samsung.com | (970) 217-8978

3 5

[alsa-devel] [PATCH v4 0/4] i915 to call hda driver on HDMI plug/unplug
by David Henningsson 02 Sep '15

02 Sep '15

It's been a while since the last patch set iteration, due to me being on vacation. But here's a new set, and I still hope that it can make it into the next merge window. Changes since v3 (with the person suggesting that change within parantheses): * Valleyview now has three pins like all the others (Libin Yang) * Renamed a few references from "hotplug" to "pin_eld" to reduce confusion with hotplug code on the i915 side (Jani Nikula) * Rewrote the dispatching from hda core to codec on the hda side (Takashi Iwai) This iteration has been tested and working on one Skylake machine. David Henningsson (4): drm/i915: Add audio pin sense / ELD callback drm/i915: Call audio pin/ELD notify function ALSA: hda - allow codecs to access the i915 pin/ELD callback ALSA: hda - Wake the codec up on pin/ELD notify events drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_audio.c | 23 ++++++++++++++++++++--- include/drm/i915_component.h | 12 ++++++++++++ include/sound/hda_i915.h | 7 +++++++ sound/hda/hdac_i915.c | 10 ++++++++++ sound/pci/hda/patch_hdmi.c | 22 +++++++++++++++++++++- 6 files changed, 71 insertions(+), 4 deletions(-) -- 1.9.1

4 18

[alsa-devel] SSM2518 Device Tree support ?
by Ricard Wanderlof 01 Sep '15

01 Sep '15

We needed DT support in the SSM2518 codec driver, and I noticed that there is already a set of bindings specified in Documentation/devicetree, however, there doesn't seem to be any DT support in the driver itself. I don't know if this is the result of a missing commit ? Documentation/devicetree/bindings/sound/ssm2518.c seems to have been added in May 2013. I've added rudimentary support for at least the compatible property so that the driver can be used in a system with DT configuration (sent as a separate email). /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 4

[alsa-devel] [PATCH v4] OMAPDSS: hdmi: Reconfigure and restart audio when display is enabled
by Jyri Sarha 01 Sep '15

01 Sep '15

Reconfigure and restart audio when display is enabled, if audio playback was active before. This is needed in a situation when an audio+video stream application opens the audio stream before the video. When video stream is opened the display mode may change and that aborts audio playback, because the display is momentarily turned off. The audio configuration is stored when it is successfully applied and a boolean is set when the audio playback is started and unset when stopped. This data is used to reconfigure the audio when display is re-enabled. The audio playback is aborted if the reconfiguration fails. A new spin lock is introduced in order to protect state variables related to audio playback status. This is needed for the transition from display enabled state (when audio start/stop commands can be written to HW) to display disabled state (when audio start/stop commands update only the hdmi.audio_playing variable) to always serialize correctly with the start/stop audio commands. The already existing mutex can not be used, because the audio start and stop commands are executed in atomic context. For example: when display is turned back on we take the spinlock and we can be sure that the audio start/stop status will not change while we update the HW according to hdmi.audio_playing state and set hdmi.display_enabled to true. After releasing the lock hdmi.display_enabled is true and all audio_start and audio_stop commands write their stuff directly to HW. Signed-off-by: Jyri Sarha <jsarha(a)ti.com> --- Fixed one bad sentece in the description. drivers/video/fbdev/omap2/dss/hdmi.h | 9 ++++- drivers/video/fbdev/omap2/dss/hdmi4.c | 66 +++++++++++++++++++++++++----- drivers/video/fbdev/omap2/dss/hdmi5.c | 76 ++++++++++++++++++++++++++++------- 3 files changed, 124 insertions(+), 27 deletions(-) diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/video/fbdev/omap2/dss/hdmi.h index e4a32fe..53616b0 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi.h +++ b/drivers/video/fbdev/omap2/dss/hdmi.h @@ -351,13 +351,20 @@ struct omap_hdmi { struct regulator *vdda_reg; bool core_enabled; - bool display_enabled; struct omap_dss_device output; struct platform_device *audio_pdev; void (*audio_abort_cb)(struct device *dev); int wp_idlemode; + + bool audio_configured; + struct omap_dss_audio audio_config; + + /* This lock should be taken when booleans bellow are touched. */ + spinlock_t audio_playing_lock; + bool audio_playing; + bool display_enabled; }; #endif diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c index 6d3aa3f..94c8d55 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/dss/hdmi4.c @@ -321,9 +321,22 @@ static int read_edid(u8 *buf, int len) return r; } +static void hdmi_start_audio_stream(struct omap_hdmi *hd) +{ + hdmi_wp_audio_enable(&hd->wp, true); + hdmi4_audio_start(&hd->core, &hd->wp); +} + +static void hdmi_stop_audio_stream(struct omap_hdmi *hd) +{ + hdmi4_audio_stop(&hd->core, &hd->wp); + hdmi_wp_audio_enable(&hd->wp, false); +} + static int hdmi_display_enable(struct omap_dss_device *dssdev) { struct omap_dss_device *out = &hdmi.output; + unsigned long flags; int r = 0; DSSDBG("ENTER hdmi_display_enable\n"); @@ -342,7 +355,21 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) goto err0; } + if (hdmi.audio_configured) { + r = hdmi4_audio_config(&hdmi.core, &hdmi.wp, &hdmi.audio_config, + hdmi.cfg.timings.pixelclock); + if (r) { + DSSERR("Error restoring audio configuration: %d", r); + hdmi.audio_abort_cb(&hdmi.pdev->dev); + hdmi.audio_configured = false; + } + } + + spin_lock_irqsave(&hdmi.audio_playing_lock, flags); + if (hdmi.audio_configured && hdmi.audio_playing) + hdmi_start_audio_stream(&hdmi); hdmi.display_enabled = true; + spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags); mutex_unlock(&hdmi.lock); return 0; @@ -354,17 +381,19 @@ err0: static void hdmi_display_disable(struct omap_dss_device *dssdev) { + unsigned long flags; + DSSDBG("Enter hdmi_display_disable\n"); mutex_lock(&hdmi.lock); - if (hdmi.audio_pdev && hdmi.audio_abort_cb) - hdmi.audio_abort_cb(&hdmi.audio_pdev->dev); + spin_lock_irqsave(&hdmi.audio_playing_lock, flags); + hdmi_stop_audio_stream(&hdmi); + hdmi.display_enabled = false; + spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags); hdmi_power_off_full(dssdev); - hdmi.display_enabled = false; - mutex_unlock(&hdmi.lock); } @@ -568,6 +597,8 @@ static int hdmi_audio_shutdown(struct device *dev) mutex_lock(&hd->lock); hd->audio_abort_cb = NULL; + hd->audio_configured = false; + hd->audio_playing = false; mutex_unlock(&hd->lock); return 0; @@ -576,25 +607,34 @@ static int hdmi_audio_shutdown(struct device *dev) static int hdmi_audio_start(struct device *dev) { struct omap_hdmi *hd = dev_get_drvdata(dev); + unsigned long flags; WARN_ON(!hdmi_mode_has_audio(&hd->cfg)); - WARN_ON(!hd->display_enabled); - hdmi_wp_audio_enable(&hd->wp, true); - hdmi4_audio_start(&hd->core, &hd->wp); + spin_lock_irqsave(&hd->audio_playing_lock, flags); + + if (hd->display_enabled) + hdmi_start_audio_stream(hd); + hd->audio_playing = true; + spin_unlock_irqrestore(&hd->audio_playing_lock, flags); return 0; } static void hdmi_audio_stop(struct device *dev) { struct omap_hdmi *hd = dev_get_drvdata(dev); + unsigned long flags; WARN_ON(!hdmi_mode_has_audio(&hd->cfg)); - WARN_ON(!hd->display_enabled); - hdmi4_audio_stop(&hd->core, &hd->wp); - hdmi_wp_audio_enable(&hd->wp, false); + spin_lock_irqsave(&hd->audio_playing_lock, flags); + + if (hd->display_enabled) + hdmi_stop_audio_stream(hd); + hd->audio_playing = false; + + spin_unlock_irqrestore(&hd->audio_playing_lock, flags); } static int hdmi_audio_config(struct device *dev, @@ -612,7 +652,10 @@ static int hdmi_audio_config(struct device *dev, ret = hdmi4_audio_config(&hd->core, &hd->wp, dss_audio, hd->cfg.timings.pixelclock); - + if (!ret) { + hd->audio_configured = true; + hd->audio_config = *dss_audio; + } out: mutex_unlock(&hd->lock); @@ -657,6 +700,7 @@ static int hdmi4_bind(struct device *dev, struct device *master, void *data) dev_set_drvdata(&pdev->dev, &hdmi); mutex_init(&hdmi.lock); + spin_lock_init(&hdmi.audio_playing_lock); if (pdev->dev.of_node) { r = hdmi_probe_of(pdev); diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index 7f87578..b6c767b 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -349,9 +349,24 @@ static int read_edid(u8 *buf, int len) return r; } +static void hdmi_start_audio_stream(struct omap_hdmi *hd) +{ + REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2); + hdmi_wp_audio_enable(&hd->wp, true); + hdmi_wp_audio_core_req_enable(&hd->wp, true); +} + +static void hdmi_stop_audio_stream(struct omap_hdmi *hd) +{ + hdmi_wp_audio_core_req_enable(&hd->wp, false); + hdmi_wp_audio_enable(&hd->wp, false); + REG_FLD_MOD(hd->wp.base, HDMI_WP_SYSCONFIG, hd->wp_idlemode, 3, 2); +} + static int hdmi_display_enable(struct omap_dss_device *dssdev) { struct omap_dss_device *out = &hdmi.output; + unsigned long flags; int r = 0; DSSDBG("ENTER hdmi_display_enable\n"); @@ -370,7 +385,21 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) goto err0; } + if (hdmi.audio_configured) { + r = hdmi5_audio_config(&hdmi.core, &hdmi.wp, &hdmi.audio_config, + hdmi.cfg.timings.pixelclock); + if (r) { + DSSERR("Error restoring audio configuration: %d", r); + hdmi.audio_abort_cb(&hdmi.pdev->dev); + hdmi.audio_configured = false; + } + } + + spin_lock_irqsave(&hdmi.audio_playing_lock, flags); + if (hdmi.audio_configured && hdmi.audio_playing) + hdmi_start_audio_stream(&hdmi); hdmi.display_enabled = true; + spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags); mutex_unlock(&hdmi.lock); return 0; @@ -382,17 +411,19 @@ err0: static void hdmi_display_disable(struct omap_dss_device *dssdev) { + unsigned long flags; + DSSDBG("Enter hdmi_display_disable\n"); mutex_lock(&hdmi.lock); - if (hdmi.audio_pdev && hdmi.audio_abort_cb) - hdmi.audio_abort_cb(&hdmi.audio_pdev->dev); + spin_lock_irqsave(&hdmi.audio_playing_lock, flags); + hdmi_stop_audio_stream(&hdmi); + hdmi.display_enabled = false; + spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags); hdmi_power_off_full(dssdev); - hdmi.display_enabled = false; - mutex_unlock(&hdmi.lock); } @@ -596,6 +627,8 @@ static int hdmi_audio_shutdown(struct device *dev) mutex_lock(&hd->lock); hd->audio_abort_cb = NULL; + hd->audio_configured = false; + hd->audio_playing = false; mutex_unlock(&hd->lock); return 0; @@ -604,32 +637,35 @@ static int hdmi_audio_shutdown(struct device *dev) static int hdmi_audio_start(struct device *dev) { struct omap_hdmi *hd = dev_get_drvdata(dev); + unsigned long flags; WARN_ON(!hdmi_mode_has_audio(&hd->cfg)); - WARN_ON(!hd->display_enabled); - /* No-idle while playing audio, store the old value */ - hd->wp_idlemode = REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2); - REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2); + spin_lock_irqsave(&hd->audio_playing_lock, flags); - hdmi_wp_audio_enable(&hd->wp, true); - hdmi_wp_audio_core_req_enable(&hd->wp, true); + if (hd->display_enabled) { + hdmi_start_audio_stream(hd); + } + hd->audio_playing = true; + spin_unlock_irqrestore(&hd->audio_playing_lock, flags); return 0; } static void hdmi_audio_stop(struct device *dev) { struct omap_hdmi *hd = dev_get_drvdata(dev); + unsigned long flags; WARN_ON(!hdmi_mode_has_audio(&hd->cfg)); - WARN_ON(!hd->display_enabled); - hdmi_wp_audio_core_req_enable(&hd->wp, false); - hdmi_wp_audio_enable(&hd->wp, false); + spin_lock_irqsave(&hd->audio_playing_lock, flags); + + if (hd->display_enabled) + hdmi_stop_audio_stream(hd); + hd->audio_playing = false; - /* Playback stopped, restore original idlemode */ - REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, hd->wp_idlemode, 3, 2); + spin_unlock_irqrestore(&hd->audio_playing_lock, flags); } static int hdmi_audio_config(struct device *dev, @@ -648,6 +684,10 @@ static int hdmi_audio_config(struct device *dev, ret = hdmi5_audio_config(&hd->core, &hd->wp, dss_audio, hd->cfg.timings.pixelclock); + if (!ret) { + hd->audio_configured = true; + hd->audio_config = *dss_audio; + } out: mutex_unlock(&hd->lock); @@ -678,6 +718,11 @@ static int hdmi_audio_register(struct device *dev) if (IS_ERR(hdmi.audio_pdev)) return PTR_ERR(hdmi.audio_pdev); + hdmi_runtime_get(); + hdmi.wp_idlemode = + REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2); + hdmi_runtime_put(); + return 0; } @@ -692,6 +737,7 @@ static int hdmi5_bind(struct device *dev, struct device *master, void *data) dev_set_drvdata(&pdev->dev, &hdmi); mutex_init(&hdmi.lock); + spin_lock_init(&hdmi.audio_playing_lock); if (pdev->dev.of_node) { r = hdmi_probe_of(pdev); -- 1.9.1

2 1

[alsa-devel] bug tracker down?
by frederik＠ofb.net 01 Sep '15

01 Sep '15

Hi guys, For some reason I can't connect to https://bugtrack.alsa-project.org/alsa-bug I want to file two bugs which I mistakenly sent to the Pulseaudio bug tracker, having to do with alsamixer. They are here and here: https://bugs.freedesktop.org/show_bug.cgi?id=91781 https://bugs.freedesktop.org/show_bug.cgi?id=91782 Thanks, Frederick

2 2

[alsa-devel] [PATCH] ASoC: fsl_ssi: Fix checking of dai format for AC97 mode
by Adam Thomson 31 Aug '15

31 Aug '15

Current code incorrectly treats dai format for AC97 as bit mask whereas it's actually an integer value. This causes DAI formats other than AC97 (e.g. DSP_B) to trigger AC97 related code, which is incorrect and breaks functionality. This patch fixes the code to correctly compare values to determine AC97 or not. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> --- sound/soc/fsl/fsl_ssi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index c0b940e..ee47041 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -249,7 +249,8 @@ MODULE_DEVICE_TABLE(of, fsl_ssi_ids); static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private) { - return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97); + return (ssi_private->dai_fmt & SND_SOC_DAIFMT_FORMAT_MASK) == + SND_SOC_DAIFMT_AC97; } static bool fsl_ssi_is_i2s_master(struct fsl_ssi_private *ssi_private) @@ -945,7 +946,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, CCSR_SSI_SCR_TCH_EN); } - if (fmt & SND_SOC_DAIFMT_AC97) + if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_AC97) fsl_ssi_setup_ac97(ssi_private); return 0; -- 1.9.3

1 0

[alsa-devel] [PATCH] reset: Add (devm_)reset_control_get stub functions
by Axel Lin 31 Aug '15

31 Aug '15

So the drivers can be compiled with CONFIG_RESET_CONTROLLER disabled. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- include/linux/reset.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/linux/reset.h b/include/linux/reset.h index da5602b..cd42c1b 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -74,6 +74,18 @@ static inline int device_reset_optional(struct device *dev) return -ENOSYS; } +static inline struct reset_control *reset_control_get( + struct device *dev, const char *id) +{ + return ERR_PTR(-ENOSYS); +} + +static inline struct reset_control *devm_reset_control_get( + struct device *dev, const char *id) +{ + return ERR_PTR(-ENOSYS); +} + static inline struct reset_control *reset_control_get_optional( struct device *dev, const char *id) { -- 2.1.0

3 2