W dniu 25.06.2011 09:11, Takashi Iwai pisze:
At Fri, 24 Jun 2011 13:25:53 +0200, Julian Sikorski wrote:
On 24/06/2011 11:12, Takashi Iwai wrote:
At Fri, 24 Jun 2011 10:34:01 +0200, Takashi Iwai wrote:
At Thu, 23 Jun 2011 18:40:47 +0200, Julian Sikorski wrote:
On 23/06/2011 14:41, Takashi Iwai wrote:
At Thu, 23 Jun 2011 08:36:55 +0200, Julian Sikorski wrote: > > Hi, > > I am coming here from pulseaudio-general mailing list [1]. I recently > got myself a Clevo P150HM laptop. It has 2.1 speakers, a built-in > microphone and the following connectors: > - headphone out > - microphone in; can be switched to center/lfe out > - spdif out; can be switched to rear speaker out > - line in; can be switched to side speaker out > Alsa does not seem to reflect that the device is capable of 5.1 and 7.1 > sound, and there are two configs showing up in pavucontrol (analog > output and analog headphones) which seem to be the same. I have uploaded > the output of alsa-info.sh [2]. Please let me know if more information > is needed.
The current parser doesn't allow the multi-io pins when the primary output is no line-out. The patch below should fix (change) the behavior. It'll count HP out, too.
Takashi
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index fe56b2b..b0cf726 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -18992,6 +18992,7 @@ static int alc662_auto_fill_dac_nids(struct hda_codec *codec, hda_nid_t dac;
spec->multiout.dac_nids = spec->private_dac_nids;
- spec->multiout.num_dacs = 0; for (i = 0; i< cfg->line_outs; i++) { dac = alc_auto_look_for_dac(codec, cfg->line_out_pins[i]); if (!dac)
@@ -19326,8 +19327,20 @@ static int alc_auto_add_multi_channel_mode(struct hda_codec *codec) unsigned int location, defcfg; int num_pins;
- if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT&& cfg->hp_outs == 1) {
/* use HP as primary out */
cfg->speaker_outs = cfg->line_outs;
memcpy(cfg->speaker_pins, cfg->line_out_pins,
sizeof(cfg->speaker_pins));
cfg->line_outs = cfg->hp_outs;
memcpy(cfg->line_out_pins, cfg->hp_pins, sizeof(cfg->hp_pins));
cfg->hp_outs = 0;
memset(cfg->hp_pins, 0, sizeof(cfg->hp_pins));
cfg->line_out_type = AUTO_PIN_HP_OUT;
alc662_auto_fill_dac_nids(codec, cfg);
- } if (cfg->line_outs != 1 ||
cfg->line_out_type != AUTO_PIN_LINE_OUT)
cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) return 0;
defcfg = snd_hda_codec_get_pincfg(codec, cfg->line_out_pins[0]);
@@ -19348,6 +19361,8 @@ static int alc_auto_add_multi_channel_mode(struct hda_codec *codec) spec->multi_ios = num_pins; spec->ext_channel_count = 2; spec->multiout.num_dacs = num_pins + 1;
/* for avoiding multi HP mixers */
} return 0; }cfg->line_out_type = AUTO_PIN_LINE_OUT;
Would you like me to test this patch? If so, what should I apply it to and how should I proceed?
Yes, the test would be appreciated, of course. Apply it to the latest 3.0-rc kernel and test.
Also, the additional patch below will give "Headphone" mixer control back while new "Surround", "Center" and "LFE" will appear.
Note that you'll need to change "Channel Mode" mixer control to "6ch" for using the surround outputs even with these patches. As default, it's set as "2ch".
Takashi
I will definitely try to give this a shot, but the outcome might be dependent on the fact whether Fedora 15 will want to work with 3.0-rc kernel.
You can build the kernel by yourself at any time...
I will definitely try.
How about 8-channel sound btw? Under Windows the device claims to be capable of it.
Do you have 4 jacks? Otherwise it's nonsense.
_From my 1st mail:
It has 2.1 speakers, a built-in microphone and the following connectors: - headphone out - microphone in; can be switched to center/lfe out - spdif out; can be switched to rear speaker out - line in; can be switched to side speaker out
Sorry if I wasn't clear, but the spdif out is a jack/optical hybrid.
Takashi
Julian