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

[alsa-devel] [PATCH 1/2] ALSA: hda - Optimize audio component check in patch_hdmi.c
by Takashi Iwai 10 Dec '15

10 Dec '15

The audio component is enabled only when CONFIG_SND_HDA_I915 is set. Give a dummy macro for allowing the compiler optimize out the relevant codes when this Kconfig isn't set. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 85342d261043..44d0d2374bb6 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -152,8 +152,12 @@ struct hdmi_spec { struct i915_audio_component_audio_ops i915_audio_ops; }; +#ifdef CONFIG_SND_HDA_I915 #define codec_has_acomp(codec) \ ((codec)->bus->core.audio_component != NULL) +#else +#define codec_has_acomp(codec) false +#endif struct hdmi_audio_infoframe { u8 type; /* 0x84 */ -- 2.6.3

1 1

[alsa-devel] [RFC][PATCH 0/3] ALSA: fireface: new driver for RME Fireface series (MIDI only)
by Takashi Sakamoto 10 Dec '15

10 Dec '15

Hi, This patchset is to add a new driver for RME Fireface series. This is still working in progress but currently the new driver support MIDI functionality. Unfortunately, ffado library can disturb this functionality. In RME::Device::init_hardware() function, the library sends a write transaction to 0x0000801003f4 with invalid value as higher part of address in IEEE 1212 or ISO/IEC 13213. This is a worst case I describe in patch 03. A workaround is to load this module after running ffado library. This module sends write transactions with valid values and regain MIDI functionality. I think it better that FFADO developers fixes the bug as long as they doesn't support MIDI functionality. Takashi Sakamoto (3): fireface: add skeleton for RME Fireface series fireface: add transaction support fireface: add support for MIDI functionality sound/firewire/Kconfig | 7 + sound/firewire/Makefile | 1 + sound/firewire/fireface/Makefile | 2 + sound/firewire/fireface/fireface-midi.c | 129 ++++++++ sound/firewire/fireface/fireface-transaction.c | 388 +++++++++++++++++++++++++ sound/firewire/fireface/fireface.c | 151 ++++++++++ sound/firewire/fireface/fireface.h | 73 +++++ 7 files changed, 751 insertions(+) create mode 100644 sound/firewire/fireface/Makefile create mode 100644 sound/firewire/fireface/fireface-midi.c create mode 100644 sound/firewire/fireface/fireface-transaction.c create mode 100644 sound/firewire/fireface/fireface.c create mode 100644 sound/firewire/fireface/fireface.h -- 2.5.0

4 23

[alsa-devel] A root cause of "unable to create IPC shm instance"
by IceBsi 10 Dec '15

10 Dec '15

Dear ALSA developers: I found a root cause of the following issue by using strace: unable to create IPC shm instance Firstly, please see the test code below: 1 #include <stdio.h> 2 #include <unistd.h> 3 #include <sys/ipc.h> 4 #include <sys/shm.h> 5 #include <errno.h> 6 #include <string.h> 7 8 int main(int argc, char *argv[]) 9 { 10 int r = 0; 11 struct shmid_ds buf; 12 key_t ipc_key = (key_t)325559; 13 size_t shmsize = 488; 14 int shmid = -1; 15 mode_t ipc_perm = 0666; 16 void *shmptr = NULL; 17 pid_t pid; 18 19 printf("___%d:%d call shmget(%d,%u,%d)\n", __LINE__, getpid(), (int)(ipc_key), shmsize, IPC_CREAT | ipc_perm); 20 shmid = shmget(ipc_key, shmsize, IPC_CREAT | ipc_perm); 21 printf("___%d:%d ret shmget=%d\n", __LINE__, getpid(), shmid); 22 23 printf("___%d:%d call shmat(%d,0,0)\n", __LINE__, getpid(), shmid); 24 shmptr = shmat(shmid, 0, 0); 25 printf("___%d:%d ret shmat=%p\n", __LINE__, getpid(), shmptr); 26 27 printf("+++%d:%d call fork\n", __LINE__, getpid()); 28 pid = fork(); 29 printf("+++%d:%d ret fork=%d\n", __LINE__, getpid(), (int)pid); 30 31 printf("___%d:%d call shmctl(%d,IPC_STAT,%p)\n", __LINE__, getpid(), shmid, &buf); 32 r = shmctl(shmid, IPC_STAT, &buf); 33 printf("___%d:%d ret shmctl=%d\n", __LINE__, getpid(), r); 34 printf("___%d:%d nattch=%lu\n", __LINE__, getpid(), buf.shm_nattch); 35 36 printf("___%d:%d call shmdt(%p)\n", __LINE__, getpid(), shmptr); 37 r = shmdt(shmptr); 38 printf("___%d:%d ret shmdt=%d\n", __LINE__, getpid(), r); 39 40 printf("___%d:%d call shmctl(%d,IPC_RMID,NULL)\n", __LINE__, getpid(), shmid); 41 r = shmctl(shmid, IPC_RMID, NULL); 42 printf("___%d:%d ret shmctl=%d, %s\n", __LINE__, getpid(), r, strerror(errno)); 43 44 if ((pid_t)0 != pid) { 45 printf("+++%d:%d call wait(NULL)\n", __LINE__, getpid()); 46 pid = wait(NULL); 47 printf("+++%d:%d ret wait=%d\n", __LINE__, getpid(), (int)pid); 48 } 49 50 return 0; 51 } The output of the test code is: ___19:11782 call shmget(325559,488,950) ___21:11782 ret shmget=2850820 ___23:11782 call shmat(2850820,0,0) ___25:11782 ret shmat=0x7f452c223000 +++27:11782 call fork +++29:11782 ret fork=11783 ___31:11782 call shmctl(2850820,IPC_STAT,0x7fffdaf0a750) ___33:11782 ret shmctl=0 ___34:11782 nattch=2 ___36:11782 call shmdt(0x7f452c223000) +++29:11783 ret fork=0 ___38:11782 ret shmdt=0 ___40:11782 call shmctl(2850820,IPC_RMID,NULL) ___31:11783 call shmctl(2850820,IPC_STAT,0x7fffdaf0a750) ___42:11782 ret shmctl=0, Success +++45:11782 call wait(NULL) ___33:11783 ret shmctl=0 ___34:11783 nattch=1 ___36:11783 call shmdt(0x7f452c223000) ___38:11783 ret shmdt=0 ___40:11783 call shmctl(2850820,IPC_RMID,NULL) ___42:11783 ret shmctl=-1, Invalid argument +++47:11782 ret wait=11783 And sometimes output is: ___19:11798 call shmget(325559,488,950) ___21:11798 ret shmget=3112964 ___23:11798 call shmat(3112964,0,0) ___25:11798 ret shmat=0x7f6b39378000 +++27:11798 call fork +++29:11798 ret fork=11799 ___31:11798 call shmctl(3112964,IPC_STAT,0x7fff3a6472a0) ___33:11798 ret shmctl=0 +++29:11799 ret fork=0 ___31:11799 call shmctl(3112964,IPC_STAT,0x7fff3a6472a0) ___34:11798 nattch=2 ___36:11798 call shmdt(0x7f6b39378000) ___33:11799 ret shmctl=0 ___38:11798 ret shmdt=0 ___34:11799 nattch=2 ___40:11798 call shmctl(3112964,IPC_RMID,NULL) ___36:11799 call shmdt(0x7f6b39378000) ___42:11798 ret shmctl=0, Success +++45:11798 call wait(NULL) ___38:11799 ret shmdt=0 ___40:11799 call shmctl(3112964,IPC_RMID,NULL) ___42:11799 ret shmctl=-1, Invalid argument +++47:11798 ret wait=11799 >From the outputs the parent process always get nattch=2, the child process get nattch=1 or sometimes get nattch=2. Then please see the following lines of src/pcm/pcm_direct.c (from alsa-lib-1.1.0.tar.bz2): 110 dmix->shmptr = shmat(dmix->shmid, 0, 0); 111 if (dmix->shmptr == (void *) -1) { 112 err = -errno; 113 snd_pcm_direct_shm_discard(dmix); 114 return err; 115 } 116 mlock(dmix->shmptr, sizeof(snd_pcm_direct_share_t)); 117 if (shmctl(dmix->shmid, IPC_STAT, &buf) < 0) { 118 err = -errno; 119 snd_pcm_direct_shm_discard(dmix); 120 return err; 121 } 122 if (buf.shm_nattch == 1) { /* we're the first user, clear the segment */ 123 memset(dmix->shmptr, 0, sizeof(snd_pcm_direct_share_t)); 124 if (dmix->ipc_gid>= 0) { 125 buf.shm_perm.gid = dmix->ipc_gid; 126 shmctl(dmix->shmid, IPC_SET, &buf); 127 } 128 dmix->shmptr->magic = SND_PCM_DIRECT_MAGIC; 129 return 1; 130 } else { 131 if (dmix->shmptr->magic != SND_PCM_DIRECT_MAGIC) { 132 snd_pcm_direct_shm_discard(dmix); 133 return -EINVAL; 134 } 135 } If an applicatioin that uses alsa-lib invokes fork() and the fork() is invoked just after shmat(line 110) and just before shmctl(line 117), buf.shm_nattch will be 2, so "buf.shm_nattch == 1" will be false. But while buf.shm_nattch is 2, we're still the first user this time, and we should executes line 123 to line 129 of the codes above. There is the following statement in `man shmget`: When a new shared memory segment is created, its contents are initialized to zero values According to the statement above, dmix->shmptr->magic is 0 on shm first created. So, to fix this issue, we should change the following line: 122 if (buf.shm_nattch == 1) { /* we're the first user, clear the segment */ to: 122 if (dmix->shmptr->magic != SND_PCM_DIRECT_MAGIC) { /* we're the first user, clear the segment */ Sincerely, Sisrnb

2 1

[alsa-devel] [PATCH v3 0/4] Add get_eld audio component for i915/HD-audio
by Takashi Iwai 10 Dec '15

10 Dec '15

Hi, this is the third revision of the patchset to add get_eld op to audio component for communicating more directly between i915 and HD-audio. Currently, the HDMI/DP audio status and ELD are notified and obtained via the hardware-level communication over HD-audio unsolicited event and verbs although the graphics driver holds the exactly same information. As we already have a notification via audio component, this is another step forward; the audio driver fetches directly the audio status and ELD via the new component op. A few patches have been dropped from this patchset as they were already applied individually beforehand. Also, two cleanup patches for i915 were squashed into one patch. The current patchset is found in sound git tree test/hdmi-jack branch. thanks, Takashi === v2->v3: * Track drm_connector for easier ELD retrieval, remove superfluous audio_enabled flag instead * Back to av_mutex * Adapt the earlier applied preliminary patches * Direct invocation of get_eld now instead of deferred call, as we have no longer deadlocks * Rebase to drm-next, update get_eld documentation for new kernel doc v1->v2: * Use modeset lock for get_eld lock, drop av mutex * Return the expected size from get_eld, not the copied size * Add reverse map from a port number to the encoder * Deferred invocation of get_eld from the eld_notify in HDA side * A bit more code refactoring in HDA side * Move audio component accessors to hdac_i915.c Takashi Iwai (4): drm/i915: Add get_eld audio component drm/i915: Add reverse mapping between port and intel_encoder ALSA: hda - Use component ops for i915 HDMI/DP audio jack handling ALSA: hda - Move audio component accesses to hdac_i915.c drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_audio.c | 59 +++++++++++++++------ drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_hdmi.c | 2 + include/drm/i915_component.h | 14 +++++ include/sound/hda_i915.h | 14 +++++ sound/hda/hdac_i915.c | 66 +++++++++++++++++++++++ sound/pci/hda/patch_hdmi.c | 104 ++++++++++++++++++++++++++++++------- 10 files changed, 229 insertions(+), 36 deletions(-) -- 2.6.3

4 14

[alsa-devel] using all channels of RME Babyface Pro in class compliant mode
by Be 10 Dec '15

10 Dec '15

Hello, I just got an RME Babyface Pro USB sound card. It can operate either as a USB audio class compliant device (with mixing controlled by the device's physical controls) or make use of a proprietary driver on Windows and Mac OS X. The proprietary driver allows for control of the mixing capabilities of the device and using onboard DSP EQ. It would be great if someone wrote a Linux driver to make use of these. I'd be happy to send debugging info or whatever about the device and test kernel patches. I could set up a Windows VM to intercept USB communication. In the meantime, I am trying to use its class compliant mode to use with Mixxx for DJing. However, I cannot figure out how to use channels 3-4 for my headphones. The device has 4 analog channels out and in plus 8 digital out and in (via ADAT). Its manual says, regarding class compliant mode, "in Mac OS X, either the first two or all channels will work, depending on the choice in the Audio MIDI Setup." I believe the two channel operation exists so when the Babyface Pro is plugged into an iPad, the iPad sends stereo output from iTunes and other programs to the Babyface Pro's main output. However, I do not know how to select between this 2 channel mode and the 12 channel mode with Linux. PulseAudio only shows it as a stereo device. Mixxx, which uses the PortAudio library, displays all 12 channels as available but doesn't work when any channels other than 1-2 are selected. Here is debugging output of Mixxx: Debug [Main]: SoundManager::setupDevices() Debug [Main]: SoundDevicePortAudio::open() "2, Babyface Pro (70785713): USB Audio (hw:1,0)" Debug [Main]: framesPerBuffer: 256 Debug [Main]: Requested sample rate: 44100 Hz, latency: 5.80499 ms Debug [Main]: Output channels: 4 | Input channels: 0 Debug [Main]: Opening stream with id 2 Expression 'alsa_snd_pcm_hw_params_set_channels( pcm, hwParams, self->numHostChannels )' failed in 'src/hostapi/alsa/pa_linux_alsa.c', line: 2051 Expression 'PaAlsaStreamComponent_InitialConfigure( &self->playback, outParams, self->primeBuffers, hwParamsPlayback, &realSr )' failed in 'src/hostapi/alsa/pa_linux_alsa.c', line: 2717 Expression 'PaAlsaStream_Configure( stream, inputParameters, outputParameters, sampleRate, framesPerBuffer, &inputLatency, &outputLatency, &hostBufferSizeMode )' failed in 'src/hostapi/alsa/pa_linux_alsa.c', line: 2838 Warning [Main]: Error opening stream: Invalid number of channels aplay -l output: **** List of PLAYBACK Hardware Devices **** card 0: PCH [HDA Intel PCH], device 0: ALC272 Analog [ALC272 Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: PCH [HDA Intel PCH], device 3: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Pro70785713 [Babyface Pro (70785713)], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 aplay -L output: null Discard all samples (playback) or generate zero samples (capture) pulse PulseAudio Sound Server default Default ALSA Output (currently PulseAudio Sound Server) sysdefault:CARD=PCH HDA Intel PCH, ALC272 Analog Default Audio Device front:CARD=PCH,DEV=0 HDA Intel PCH, ALC272 Analog Front speakers surround21:CARD=PCH,DEV=0 HDA Intel PCH, ALC272 Analog 2.1 Surround output to Front and Subwoofer speakers surround40:CARD=PCH,DEV=0 HDA Intel PCH, ALC272 Analog 4.0 Surround output to Front and Rear speakers surround41:CARD=PCH,DEV=0 HDA Intel PCH, ALC272 Analog 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=PCH,DEV=0 HDA Intel PCH, ALC272 Analog 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=PCH,DEV=0 HDA Intel PCH, ALC272 Analog 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=PCH,DEV=0 HDA Intel PCH, ALC272 Analog 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers hdmi:CARD=PCH,DEV=0 HDA Intel PCH, HDMI 0 HDMI Audio Output sysdefault:CARD=Pro70785713 Babyface Pro (70785713), USB Audio Default Audio Device front:CARD=Pro70785713,DEV=0 Babyface Pro (70785713), USB Audio Front speakers surround21:CARD=Pro70785713,DEV=0 Babyface Pro (70785713), USB Audio 2.1 Surround output to Front and Subwoofer speakers surround40:CARD=Pro70785713,DEV=0 Babyface Pro (70785713), USB Audio 4.0 Surround output to Front and Rear speakers surround41:CARD=Pro70785713,DEV=0 Babyface Pro (70785713), USB Audio 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=Pro70785713,DEV=0 Babyface Pro (70785713), USB Audio 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=Pro70785713,DEV=0 Babyface Pro (70785713), USB Audio 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=Pro70785713,DEV=0 Babyface Pro (70785713), USB Audio 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers iec958:CARD=Pro70785713,DEV=0 Babyface Pro (70785713), USB Audio IEC958 (S/PDIF) Digital Audio Output /proc/asound/card1/stream0 when playing to channels 1-2 with PulseAudio: RME Babyface Pro (70785713) at usb-0000:00:1d.0-1.2, high speed : USB Audio Playback: Status: Running Interface = 1 Altset = 1 Packet Size = 47 Momentary freq = 44118 Hz (0x5.83c9) Feedback Format = 16.16 Interface 1 Altset 1 Format: S24_3LE Channels: 2 Endpoint: 3 OUT (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Interface 1 Altset 2 Format: S24_3LE Channels: 12 Endpoint: 3 OUT (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Capture: Status: Stop Interface 2 Altset 1 Format: S24_3LE Channels: 12 Endpoint: 4 IN (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us Interface 2 Altset 2 Format: S24_3LE Channels: 2 Endpoint: 4 IN (ASYNC) Rates: 44100, 48000, 88200, 96000, 176400, 192000 Data packet interval: 125 us So I guess the question is how to get PortAudio to use the "Altset 2" option. Could this be accomplished with some asoundrc sorcery? Does something need to change in snd-usb-audio? Is the issue with PortAudio and PulseAudio? How can I test channels 3-4 with aplay or another program?

2 2

[alsa-devel] [PATCH] ALSA: hda - Implement loopback control switch for Realtek and other codecs
by Takashi Iwai 10 Dec '15

10 Dec '15

Many codecs, typically found on Realtek codecs, have the analog loopback path merged to the secondary input of the middle of the output paths. Currently, we don't offer the dynamic switching in such configuration but let each loopback path mute by itself. This should work well in theory, but in reality, we often see that such a dead loopback path causes some background noises even if all the elements get muted. Such a problem has been fixed by adding the quirk accordingly to disable aamix, and it's the right fix, per se. The only problem is that it's not so trivial to achieve it; user needs to pass a hint string via patch module option or sysfs. This patch gives a bit improvement on the situation: it adds "Loopback Mixing" control element for such codecs like other codecs (e.g. IDT or VIA codecs) with the individual loopback paths. User can turn on/off the loopback path simply via a mixer app. For keeping the compatibility, the loopback is still enabled on these codecs. But user can try to turn it off if experiencing a suspicious background or click noise on the fly, then build a static fixup later once after the problem is addressed. Other than the addition of the loopback enable/disablement control, there should be no changes. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_generic.c | 87 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 68 insertions(+), 19 deletions(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index f3c058f6c831..30c8efe0f80a 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -754,9 +754,6 @@ static void activate_amp(struct hda_codec *codec, hda_nid_t nid, int dir, unsigned int caps; unsigned int mask, val; - if (!enable && is_active_nid(codec, nid, dir, idx_to_check)) - return; - caps = query_amp_caps(codec, nid, dir); val = get_amp_val_to_activate(codec, nid, dir, caps, enable); mask = get_amp_mask_to_modify(codec, nid, dir, idx_to_check, caps); @@ -767,12 +764,22 @@ static void activate_amp(struct hda_codec *codec, hda_nid_t nid, int dir, update_amp(codec, nid, dir, idx, mask, val); } +static void check_and_activate_amp(struct hda_codec *codec, hda_nid_t nid, + int dir, int idx, int idx_to_check, + bool enable) +{ + /* check whether the given amp is still used by others */ + if (!enable && is_active_nid(codec, nid, dir, idx_to_check)) + return; + activate_amp(codec, nid, dir, idx, idx_to_check, enable); +} + static void activate_amp_out(struct hda_codec *codec, struct nid_path *path, int i, bool enable) { hda_nid_t nid = path->path[i]; init_amp(codec, nid, HDA_OUTPUT, 0); - activate_amp(codec, nid, HDA_OUTPUT, 0, 0, enable); + check_and_activate_amp(codec, nid, HDA_OUTPUT, 0, 0, enable); } static void activate_amp_in(struct hda_codec *codec, struct nid_path *path, @@ -800,9 +807,16 @@ static void activate_amp_in(struct hda_codec *codec, struct nid_path *path, * when aa-mixer is available, we need to enable the path as well */ for (n = 0; n < nums; n++) { - if (n != idx && (!add_aamix || conn[n] != spec->mixer_merge_nid)) - continue; - activate_amp(codec, nid, HDA_INPUT, n, idx, enable); + if (n != idx) { + if (conn[n] != spec->mixer_merge_nid) + continue; + /* when aamix is disabled, force to off */ + if (!add_aamix) { + activate_amp(codec, nid, HDA_INPUT, n, n, false); + continue; + } + } + check_and_activate_amp(codec, nid, HDA_INPUT, n, idx, enable); } } @@ -1563,6 +1577,12 @@ static bool map_singles(struct hda_codec *codec, int outs, return found; } +static inline bool has_aamix_out_paths(struct hda_gen_spec *spec) +{ + return spec->aamix_out_paths[0] || spec->aamix_out_paths[1] || + spec->aamix_out_paths[2]; +} + /* create a new path including aamix if available, and return its index */ static int check_aamix_out_path(struct hda_codec *codec, int path_idx) { @@ -2405,25 +2425,51 @@ static void update_aamix_paths(struct hda_codec *codec, bool do_mix, } } +/* re-initialize the output paths; only called from loopback_mixing_put() */ +static void update_output_paths(struct hda_codec *codec, int num_outs, + const int *paths) +{ + struct hda_gen_spec *spec = codec->spec; + struct nid_path *path; + int i; + + for (i = 0; i < num_outs; i++) { + path = snd_hda_get_path_from_idx(codec, paths[i]); + if (path) + snd_hda_activate_path(codec, path, path->active, + spec->aamix_mode); + } +} + static int loopback_mixing_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_gen_spec *spec = codec->spec; + const struct auto_pin_cfg *cfg = &spec->autocfg; unsigned int val = ucontrol->value.enumerated.item[0]; if (val == spec->aamix_mode) return 0; spec->aamix_mode = val; - update_aamix_paths(codec, val, spec->out_paths[0], - spec->aamix_out_paths[0], - spec->autocfg.line_out_type); - update_aamix_paths(codec, val, spec->hp_paths[0], - spec->aamix_out_paths[1], - AUTO_PIN_HP_OUT); - update_aamix_paths(codec, val, spec->speaker_paths[0], - spec->aamix_out_paths[2], - AUTO_PIN_SPEAKER_OUT); + if (has_aamix_out_paths(spec)) { + update_aamix_paths(codec, val, spec->out_paths[0], + spec->aamix_out_paths[0], + cfg->line_out_type); + update_aamix_paths(codec, val, spec->hp_paths[0], + spec->aamix_out_paths[1], + AUTO_PIN_HP_OUT); + update_aamix_paths(codec, val, spec->speaker_paths[0], + spec->aamix_out_paths[2], + AUTO_PIN_SPEAKER_OUT); + } else { + update_output_paths(codec, cfg->line_outs, spec->out_paths); + if (cfg->line_out_type != AUTO_PIN_HP_OUT) + update_output_paths(codec, cfg->hp_outs, spec->hp_paths); + if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) + update_output_paths(codec, cfg->speaker_outs, + spec->speaker_paths); + } return 1; } @@ -2441,12 +2487,13 @@ static int create_loopback_mixing_ctl(struct hda_codec *codec) if (!spec->mixer_nid) return 0; - if (!(spec->aamix_out_paths[0] || spec->aamix_out_paths[1] || - spec->aamix_out_paths[2])) - return 0; if (!snd_hda_gen_add_kctl(spec, NULL, &loopback_mixing_enum)) return -ENOMEM; spec->have_aamix_ctl = 1; + /* if no explicit aamix path is present (e.g. for Realtek codecs), + * enable aamix as default -- just for compatibility + */ + spec->aamix_mode = !has_aamix_out_paths(spec); return 0; } @@ -5647,6 +5694,8 @@ static void init_aamix_paths(struct hda_codec *codec) if (!spec->have_aamix_ctl) return; + if (!has_aamix_out_paths(spec)) + return; update_aamix_paths(codec, spec->aamix_mode, spec->out_paths[0], spec->aamix_out_paths[0], spec->autocfg.line_out_type); -- 2.6.3

2 2

[alsa-devel] [PATCH] ASoC: es8328: Fix deemphasis values
by John Keeping 09 Dec '15

09 Dec '15

This is using completely the wrong mask and value when updating the register. Since the correct values are already defined in the header, switch to using a table with explicit constants rather than shifting the array index. Signed-off-by: John Keeping <john(a)metanate.com> --- sound/soc/codecs/es8328.c | 25 +++++++++++++++++-------- sound/soc/codecs/es8328.h | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c index 84f5eb0..afa6c5d 100644 --- a/sound/soc/codecs/es8328.c +++ b/sound/soc/codecs/es8328.c @@ -85,7 +85,15 @@ static const DECLARE_TLV_DB_SCALE(pga_tlv, 0, 300, 0); static const DECLARE_TLV_DB_SCALE(bypass_tlv, -1500, 300, 0); static const DECLARE_TLV_DB_SCALE(mic_tlv, 0, 300, 0); -static const int deemph_settings[] = { 0, 32000, 44100, 48000 }; +static const struct { + int rate; + unsigned int val; +} deemph_settings[] = { + { 0, ES8328_DACCONTROL6_DEEMPH_OFF }, + { 32000, ES8328_DACCONTROL6_DEEMPH_32k }, + { 44100, ES8328_DACCONTROL6_DEEMPH_44_1k }, + { 48000, ES8328_DACCONTROL6_DEEMPH_48k }, +}; static int es8328_set_deemph(struct snd_soc_codec *codec) { @@ -97,21 +105,22 @@ static int es8328_set_deemph(struct snd_soc_codec *codec) * rate. */ if (es8328->deemph) { - best = 1; - for (i = 2; i < ARRAY_SIZE(deemph_settings); i++) { - if (abs(deemph_settings[i] - es8328->playback_fs) < - abs(deemph_settings[best] - es8328->playback_fs)) + best = 0; + for (i = 1; i < ARRAY_SIZE(deemph_settings); i++) { + if (abs(deemph_settings[i].rate - es8328->playback_fs) < + abs(deemph_settings[best].rate - es8328->playback_fs)) best = i; } - val = best << 1; + val = deemph_settings[best].val; } else { - val = 0; + val = ES8328_DACCONTROL6_DEEMPH_OFF; } dev_dbg(codec->dev, "Set deemphasis %d\n", val); - return snd_soc_update_bits(codec, ES8328_DACCONTROL6, 0x6, val); + return snd_soc_update_bits(codec, ES8328_DACCONTROL6, + ES8328_DACCONTROL6_DEEMPH_MASK, val); } static int es8328_get_deemph(struct snd_kcontrol *kcontrol, diff --git a/sound/soc/codecs/es8328.h b/sound/soc/codecs/es8328.h index cb36afe..156c748 100644 --- a/sound/soc/codecs/es8328.h +++ b/sound/soc/codecs/es8328.h @@ -153,6 +153,7 @@ int es8328_probe(struct device *dev, struct regmap *regmap); #define ES8328_DACCONTROL6_CLICKFREE (1 << 3) #define ES8328_DACCONTROL6_DAC_INVR (1 << 4) #define ES8328_DACCONTROL6_DAC_INVL (1 << 5) +#define ES8328_DACCONTROL6_DEEMPH_MASK (3 << 6) #define ES8328_DACCONTROL6_DEEMPH_OFF (0 << 6) #define ES8328_DACCONTROL6_DEEMPH_32k (1 << 6) #define ES8328_DACCONTROL6_DEEMPH_44_1k (2 << 6) -- 2.6.3.462.gbe2c914

2 1

[alsa-devel] [PATCH V3 0/2] Add support for Pistachio internal DAC
by Damien Horsley 09 Dec '15

09 Dec '15

From: "Damien.Horsley" <Damien.Horsley(a)imgtec.com> Add binding document and driver for Pistachio internal DAC Changes in V3: Mute control definition changed to SOC_SINGLE Codec driver probe function added to associate regmap with codec Damien.Horsley (2): ASoC: img: Add binding document for Pistachio internal DAC ASoC: img: Add driver for Pistachio internal DAC .../bindings/sound/img,pistachio-internal-dac.txt | 18 ++ sound/soc/img/Kconfig | 8 + sound/soc/img/Makefile | 2 + sound/soc/img/pistachio-internal-dac.c | 287 +++++++++++++++++++++ 4 files changed, 315 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt create mode 100644 sound/soc/img/pistachio-internal-dac.c -- 2.1.4

2 3

[alsa-devel] [asoc:topic/intel 75/78] sound/soc/intel/boards/skl_rt286.c:55:2: error: implicit declaration of function 'SND_SOC_DAPM_SINK'
by kbuild test robot 09 Dec '15

09 Dec '15

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: 9ec2053b13f75d7ad9c0e6db9763954bd1a1b9ae commit: b34e24d2406f123d5dbbff4fdeebbc2af76b0acd [75/78] ASoC: Intel: Skylake: add wov as int sink config: i386-allmodconfig (attached as .config) reproduce: git checkout b34e24d2406f123d5dbbff4fdeebbc2af76b0acd # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): >> sound/soc/intel/boards/skl_rt286.c:55:2: error: implicit declaration of function 'SND_SOC_DAPM_SINK' [-Werror=implicit-function-declaration] SND_SOC_DAPM_SINK("WoV Sink"), ^ >> sound/soc/intel/boards/skl_rt286.c:55:2: error: initializer element is not constant sound/soc/intel/boards/skl_rt286.c:55:2: note: (near initialization for 'skylake_widgets[5].id') >> sound/soc/intel/boards/skl_rt286.c:49:61: warning: missing braces around initializer [-Wmissing-braces] static const struct snd_soc_dapm_widget skylake_widgets[] = { ^ sound/soc/intel/boards/skl_rt286.c:49:61: note: (near initialization for 'skylake_widgets') cc1: some warnings being treated as errors vim +/SND_SOC_DAPM_SINK +55 sound/soc/intel/boards/skl_rt286.c 43 static const struct snd_kcontrol_new skylake_controls[] = { 44 SOC_DAPM_PIN_SWITCH("Speaker"), 45 SOC_DAPM_PIN_SWITCH("Headphone Jack"), 46 SOC_DAPM_PIN_SWITCH("Mic Jack"), 47 }; 48 > 49 static const struct snd_soc_dapm_widget skylake_widgets[] = { 50 SND_SOC_DAPM_HP("Headphone Jack", NULL), 51 SND_SOC_DAPM_SPK("Speaker", NULL), 52 SND_SOC_DAPM_MIC("Mic Jack", NULL), 53 SND_SOC_DAPM_MIC("DMIC2", NULL), 54 SND_SOC_DAPM_MIC("SoC DMIC", NULL), > 55 SND_SOC_DAPM_SINK("WoV Sink"), 56 }; 57 58 static const struct snd_soc_dapm_route skylake_rt286_map[] = { --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] Intel HDA / ca0132: quirk for Alienware 17 2015
by Gabriele Martino 09 Dec '15

09 Dec '15

The Alienware 17 (2015) has the same card and pin configuration of the Alienware 15, so the same quirks must be applied. Signed-off-by: Gabriele Martino <g.martino(a)gmx.com>

2 3