mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
875f0dd799
CMI8888 codec chip has a boost amp (only) on the headphone pin, and this confuses the generic parser, which tends to pick up the most outside amp. This results in the wrong volume setup, as the driver complains like: hda_codec: Mismatching dB step for vmaster slave (-100!=1000) For avoiding this problem, rule out the amp on NID 0x10 and create "Headphone Amp" volume control manually instead. Note that this patch still doesn't fix all problems yet. The sound output from the line out seems still too low. It will be fixed in another patch (hopefully). Reported-and-tested-by: Vincent Lejeune <vljn@ovi.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
156 lines
3.8 KiB
C
156 lines
3.8 KiB
C
/*
|
|
* Universal Interface for Intel High Definition Audio Codec
|
|
*
|
|
* HD audio interface patch for C-Media CMI9880
|
|
*
|
|
* Copyright (c) 2004 Takashi Iwai <tiwai@suse.de>
|
|
*
|
|
*
|
|
* This driver is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This driver is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <sound/core.h>
|
|
#include "hda_codec.h"
|
|
#include "hda_local.h"
|
|
#include "hda_auto_parser.h"
|
|
#include "hda_jack.h"
|
|
#include "hda_generic.h"
|
|
|
|
struct cmi_spec {
|
|
struct hda_gen_spec gen;
|
|
};
|
|
|
|
/*
|
|
* stuff for auto-parser
|
|
*/
|
|
static const struct hda_codec_ops cmi_auto_patch_ops = {
|
|
.build_controls = snd_hda_gen_build_controls,
|
|
.build_pcms = snd_hda_gen_build_pcms,
|
|
.init = snd_hda_gen_init,
|
|
.free = snd_hda_gen_free,
|
|
.unsol_event = snd_hda_jack_unsol_event,
|
|
};
|
|
|
|
static int patch_cmi9880(struct hda_codec *codec)
|
|
{
|
|
struct cmi_spec *spec;
|
|
struct auto_pin_cfg *cfg;
|
|
int err;
|
|
|
|
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
|
|
if (spec == NULL)
|
|
return -ENOMEM;
|
|
|
|
codec->spec = spec;
|
|
cfg = &spec->gen.autocfg;
|
|
snd_hda_gen_spec_init(&spec->gen);
|
|
|
|
err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0);
|
|
if (err < 0)
|
|
goto error;
|
|
err = snd_hda_gen_parse_auto_config(codec, cfg);
|
|
if (err < 0)
|
|
goto error;
|
|
|
|
codec->patch_ops = cmi_auto_patch_ops;
|
|
return 0;
|
|
|
|
error:
|
|
snd_hda_gen_free(codec);
|
|
return err;
|
|
}
|
|
|
|
static int patch_cmi8888(struct hda_codec *codec)
|
|
{
|
|
struct cmi_spec *spec;
|
|
struct auto_pin_cfg *cfg;
|
|
int err;
|
|
|
|
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
|
|
if (!spec)
|
|
return -ENOMEM;
|
|
|
|
codec->spec = spec;
|
|
cfg = &spec->gen.autocfg;
|
|
snd_hda_gen_spec_init(&spec->gen);
|
|
|
|
/* mask NID 0x10 from the playback volume selection;
|
|
* it's a headphone boost volume handled manually below
|
|
*/
|
|
spec->gen.out_vol_mask = (1ULL << 0x10);
|
|
|
|
err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0);
|
|
if (err < 0)
|
|
goto error;
|
|
err = snd_hda_gen_parse_auto_config(codec, cfg);
|
|
if (err < 0)
|
|
goto error;
|
|
|
|
if (get_defcfg_device(snd_hda_codec_get_pincfg(codec, 0x10)) ==
|
|
AC_JACK_HP_OUT) {
|
|
static const struct snd_kcontrol_new amp_kctl =
|
|
HDA_CODEC_VOLUME("Headphone Amp Playback Volume",
|
|
0x10, 0, HDA_OUTPUT);
|
|
if (!snd_hda_gen_add_kctl(&spec->gen, NULL, &_kctl)) {
|
|
err = -ENOMEM;
|
|
goto error;
|
|
}
|
|
}
|
|
|
|
codec->patch_ops = cmi_auto_patch_ops;
|
|
return 0;
|
|
|
|
error:
|
|
snd_hda_gen_free(codec);
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* patch entries
|
|
*/
|
|
static const struct hda_codec_preset snd_hda_preset_cmedia[] = {
|
|
{ .id = 0x13f68888, .name = "CMI8888", .patch = patch_cmi8888 },
|
|
{ .id = 0x13f69880, .name = "CMI9880", .patch = patch_cmi9880 },
|
|
{ .id = 0x434d4980, .name = "CMI9880", .patch = patch_cmi9880 },
|
|
{} /* terminator */
|
|
};
|
|
|
|
MODULE_ALIAS("snd-hda-codec-id:13f68888");
|
|
MODULE_ALIAS("snd-hda-codec-id:13f69880");
|
|
MODULE_ALIAS("snd-hda-codec-id:434d4980");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("C-Media HD-audio codec");
|
|
|
|
static struct hda_codec_preset_list cmedia_list = {
|
|
.preset = snd_hda_preset_cmedia,
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
static int __init patch_cmedia_init(void)
|
|
{
|
|
return snd_hda_add_codec_preset(&cmedia_list);
|
|
}
|
|
|
|
static void __exit patch_cmedia_exit(void)
|
|
{
|
|
snd_hda_delete_codec_preset(&cmedia_list);
|
|
}
|
|
|
|
module_init(patch_cmedia_init)
|
|
module_exit(patch_cmedia_exit)
|