From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755658Ab3BEReo (ORCPT ); Tue, 5 Feb 2013 12:34:44 -0500 Received: from cantor2.suse.de ([195.135.220.15]:33150 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754157Ab3BERen (ORCPT ); Tue, 5 Feb 2013 12:34:43 -0500 Date: Tue, 05 Feb 2013 18:34:41 +0100 Message-ID: From: Takashi Iwai To: Daniel J Blueman Cc: Linux Kernel , alsa-devel@alsa-project.org Subject: Re: 3.8-rc1 patch_cirrus 4.0 regression... In-Reply-To: References: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Tue, 05 Feb 2013 17:16:32 +0100, Takashi Iwai wrote: > > At Wed, 6 Feb 2013 00:10:30 +0800, > Daniel J Blueman wrote: > > > > Hi Takashi, > > > > The v3.8-rc kernels have regressed from v3.7 with the quad-speaker > > arrangement on my Macbook Pro 10,1 - only the higher-frequency > > speakers work despite the front and rear channels being exposed in the > > mixer. > > Interesting. So you have a machine with 4.0 built-in speaker instead > of 2.1? Then we need to add a device-specific flag for it. Currently > the driver assumes 2.1 system blindly because majority of machines > have that. > > FWIW, the codec parser code has been totally rewritten for 3.9, so any > patch to 3.8 won't be applied to 3.9 (and vice versa)... > > Could you give alsa-info.sh output on 3.8 kernel? Then I'll try to > cook it for 3.9 (and maybe backport to 3.8). The patch below is a quick fix for 3.8-rc6. Could you check whether this works alone? Takashi --- diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index a2537b2..d74e06c 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -448,7 +448,8 @@ static int parse_output(struct hda_codec *codec) spec->multiout.max_channels = i * 2; if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT && i == 2) - spec->speaker_2_1 = 1; /* assume 2.1 speakers */ + if (spec->gen.fixup_id != CS420X_MBP101) + spec->speaker_2_1 = 1; /* assume 2.1 speakers */ /* add HP and speakers */ extra_nids = 0;