On Wed, 7 Mar 2007 20:41:30 +0100 "Michal Piotrowski" <[EMAIL PROTECTED]> wrote:
> > > 831466f4ad2b5fe23dff77edbe6a7c244435e973 is first bad commit
> > > commit 831466f4ad2b5fe23dff77edbe6a7c244435e973
> > > Author: Randy Cushman <[EMAIL PROTECTED]>
> > > Date: Tue Dec 19 18:42:16 2006 +0100
> > >
> > > [ALSA] ac97 - fix microphone and line_in selection logic
> > >
> > > This patch fixes the Microphone and LINE_IN select logic for
> > > Analog Devices surround codecs with shared jacks. The existing
> > > code can never utilize the shared jacks for Microphone and LINE_IN
> > > due to the reversed jack selection logic. The patched code
> > > correctly selects the shared jack for input if the 'Channel Mode'
> > > selector does not specify that the jack is to be used for output.
> > > Specifically, in '2ch' mode the Center/LFE jack is used for
> > > microphone input and the Surround jack is used for LINE_IN,
> > > in '4ch' mode the Center/LFE jack is used for microphone input
> > > and the Surround jack is used for output, and in '6ch' mode
> > > both jacks are used for output.
> > >
> > > Signed-off-by: Randy Cushman <[EMAIL PROTECTED]>
> > > Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
> > > Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
> > >
> >
> > Is 2.6.21-rc3 similarly broken?
>
> Yes.
>
OK. Can you please confirm that applying the below fixes 2.6.21-rc3?
If so, I'll queue it up for application in a week or two if there is no
progress on this.
From: Andrew Morton <[EMAIL PROTECTED]>
Revert 831466f4ad2b5fe23dff77edbe6a7c244435e973: "Michal Piotrowski"
<[EMAIL PROTECTED]> reports that it broke his 3d surround.
Cc:"Michal Piotrowski" <[EMAIL PROTECTED]>
Cc: Randy Cushman <[EMAIL PROTECTED]>
Cc: Takashi Iwai <[EMAIL PROTECTED]>
Cc: Jaroslav Kysela <[EMAIL PROTECTED]>
Cc: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
sound/pci/ac97/ac97_patch.c | 66 +++++++++++++---------------------
1 file changed, 26 insertions(+), 40 deletions(-)
diff -puN
sound/pci/ac97/ac97_patch.c~revert-ac97-fix-microphone-and-line_in-selection-logic
sound/pci/ac97/ac97_patch.c
---
a/sound/pci/ac97/ac97_patch.c~revert-ac97-fix-microphone-and-line_in-selection-logic
+++ a/sound/pci/ac97/ac97_patch.c
@@ -178,28 +178,14 @@ static inline int is_clfe_on(struct snd_
return ac97->channel_mode >= 2;
}
-/* system has shared jacks with surround out enabled */
-static inline int is_shared_surrout(struct snd_ac97 *ac97)
-{
- return !ac97->indep_surround && is_surround_on(ac97);
-}
-
-/* system has shared jacks with center/lfe out enabled */
-static inline int is_shared_clfeout(struct snd_ac97 *ac97)
-{
- return !ac97->indep_surround && is_clfe_on(ac97);
-}
-
-/* system has shared jacks with line in enabled */
static inline int is_shared_linein(struct snd_ac97 *ac97)
{
- return !ac97->indep_surround && !is_surround_on(ac97);
+ return ! ac97->indep_surround && is_surround_on(ac97);
}
-/* system has shared jacks with mic in enabled */
static inline int is_shared_micin(struct snd_ac97 *ac97)
{
- return !ac97->indep_surround && !is_clfe_on(ac97);
+ return ! ac97->indep_surround && is_clfe_on(ac97);
}
@@ -2473,12 +2459,12 @@ static void alc650_update_jacks(struct s
{
int shared;
- /* shared Line-In / Surround Out */
- shared = is_shared_surrout(ac97);
+ /* shared Line-In */
+ shared = is_shared_linein(ac97);
snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 1 << 9,
shared ? (1 << 9) : 0);
- /* update shared Mic In / Center/LFE Out */
- shared = is_shared_clfeout(ac97);
+ /* update shared Mic */
+ shared = is_shared_micin(ac97);
/* disable/enable vref */
snd_ac97_update_bits(ac97, AC97_ALC650_CLOCK, 1 << 12,
shared ? (1 << 12) : 0);
@@ -2608,12 +2594,12 @@ static void alc655_update_jacks(struct s
{
int shared;
- /* shared Line-In / Surround Out */
- shared = is_shared_surrout(ac97);
+ /* shared Line-In */
+ shared = is_shared_linein(ac97);
ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 1 << 9,
shared ? (1 << 9) : 0, 0);
- /* update shared Mic In / Center/LFE Out */
- shared = is_shared_clfeout(ac97);
+ /* update shared mic */
+ shared = is_shared_micin(ac97);
/* misc control; vrefout disable */
snd_ac97_update_bits(ac97, AC97_ALC650_CLOCK, 1 << 12,
shared ? (1 << 12) : 0);
@@ -2757,16 +2743,16 @@ static void alc850_update_jacks(struct s
{
int shared;
- /* shared Line-In / Surround Out */
- shared = is_shared_surrout(ac97);
+ /* shared Line-In */
+ shared = is_shared_linein(ac97);
/* SURR 1kOhm (bit4), Amp (bit5) */
snd_ac97_update_bits(ac97, AC97_ALC850_MISC1, (1<<4)|(1<<5),
shared ? (1<<5) : (1<<4));
/* LINE-IN = 0, SURROUND = 2 */
snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 12,
shared ? (2<<12) : (0<<12));
- /* update shared Mic In / Center/LFE Out */
- shared = is_shared_clfeout(ac97);
+ /* update shared mic */
+ shared = is_shared_micin(ac97);
/* Vref disable (bit12), 1kOhm (bit13) */
snd_ac97_update_bits(ac97, AC97_ALC850_MISC1, (1<<12)|(1<<13),
shared ? (1<<12) : (1<<13));
@@ -2839,9 +2825,9 @@ static int patch_alc850(struct snd_ac97
*/
static void cm9738_update_jacks(struct snd_ac97 *ac97)
{
- /* shared Line-In / Surround Out */
+ /* shared Line-In */
snd_ac97_update_bits(ac97, AC97_CM9738_VENDOR_CTRL, 1 << 10,
- is_shared_surrout(ac97) ? (1 << 10) : 0);
+ is_shared_linein(ac97) ? (1 << 10) : 0);
}
static const struct snd_kcontrol_new snd_ac97_cm9738_controls[] = {
@@ -2923,12 +2909,12 @@ static const struct snd_kcontrol_new snd
static void cm9739_update_jacks(struct snd_ac97 *ac97)
{
- /* shared Line-In / Surround Out */
+ /* shared Line-In */
snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 1 << 10,
- is_shared_surrout(ac97) ? (1 << 10) : 0);
- /* shared Mic In / Center/LFE Out **/
+ is_shared_linein(ac97) ? (1 << 10) : 0);
+ /* shared Mic */
snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 0x3000,
- is_shared_clfeout(ac97) ? 0x1000 : 0x2000);
+ is_shared_micin(ac97) ? 0x1000 : 0x2000);
}
static const struct snd_kcontrol_new snd_ac97_cm9739_controls[] = {
@@ -3040,8 +3026,8 @@ static void cm9761_update_jacks(struct s
val |= surr_on[ac97->spec.dev_flags][is_surround_on(ac97)];
val |= clfe_on[ac97->spec.dev_flags][is_clfe_on(ac97)];
- val |= surr_shared[ac97->spec.dev_flags][is_shared_surrout(ac97)];
- val |= clfe_shared[ac97->spec.dev_flags][is_shared_clfeout(ac97)];
+ val |= surr_shared[ac97->spec.dev_flags][is_shared_linein(ac97)];
+ val |= clfe_shared[ac97->spec.dev_flags][is_shared_micin(ac97)];
snd_ac97_update_bits(ac97, AC97_CM9761_MULTI_CHAN, 0x3c88, val);
}
@@ -3289,12 +3275,12 @@ static int patch_vt1617a(struct snd_ac97
*/
static void it2646_update_jacks(struct snd_ac97 *ac97)
{
- /* shared Line-In / Surround Out */
+ /* shared Line-In */
snd_ac97_update_bits(ac97, 0x76, 1 << 9,
- is_shared_surrout(ac97) ? (1<<9) : 0);
- /* shared Mic / Center/LFE Out */
+ is_shared_linein(ac97) ? (1<<9) : 0);
+ /* shared Mic */
snd_ac97_update_bits(ac97, 0x76, 1 << 10,
- is_shared_clfeout(ac97) ? (1<<10) : 0);
+ is_shared_micin(ac97) ? (1<<10) : 0);
}
static const struct snd_kcontrol_new snd_ac97_controls_it2646[] = {
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
