GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 00:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ALSA: virtuoso: add HDMI enable switch for HDAV1.3

Browse source 
The GPIO bit that enables analog output on the Xonar HDAV1.3 also
disables the HDMI audio output, so we better add a switch for it.
Hopefully, this is sufficient to make the HDMI output work.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2010-12-02 11:38:06 +01:00 • committed by Takashi Iwai
parent f7e4bad74e
commit 2509ec623d
4 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sound/pci/Kconfig
View file

@ -817,7 +817,7 @@ config SND_VIRTUOSO
Say Y here to include support for sound cards based on the Say Y here to include support for sound cards based on the
Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS, Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS,
Essence ST (Deluxe), and Essence STX. Essence ST (Deluxe), and Essence STX.
Support for the HDAV1.3 (Deluxe) is incomplete; for the Support for the HDAV1.3 (Deluxe) is experimental; for the
HDAV1.3 Slim and Xense, missing. HDAV1.3 Slim and Xense, missing.
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module

2
sound/pci/oxygen/xonar.h
View file

@ -24,6 +24,8 @@ void xonar_init_ext_power(struct oxygen *chip);
void xonar_init_cs53x1(struct oxygen *chip); void xonar_init_cs53x1(struct oxygen *chip);
void xonar_set_cs53x1_params(struct oxygen *chip, void xonar_set_cs53x1_params(struct oxygen *chip,
struct snd_pcm_hw_params *params); struct snd_pcm_hw_params *params);
#define XONAR_GPIO_BIT_INVERT (1 << 16)
int xonar_gpio_bit_switch_get(struct snd_kcontrol *ctl, int xonar_gpio_bit_switch_get(struct snd_kcontrol *ctl,
struct snd_ctl_elem_value *value); struct snd_ctl_elem_value *value);
int xonar_gpio_bit_switch_put(struct snd_kcontrol *ctl, int xonar_gpio_bit_switch_put(struct snd_kcontrol *ctl,

6
sound/pci/oxygen/xonar_lib.c
View file

@ -104,9 +104,10 @@ int xonar_gpio_bit_switch_get(struct snd_kcontrol *ctl,
{ {
struct oxygen *chip = ctl->private_data; struct oxygen *chip = ctl->private_data;
u16 bit = ctl->private_value; u16 bit = ctl->private_value;
bool invert = ctl->private_value & XONAR_GPIO_BIT_INVERT;
value->value.integer.value[0] = value->value.integer.value[0] =
!!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & bit); !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & bit) ^ invert;
return 0; return 0;
} }
@ -115,12 +116,13 @@ int xonar_gpio_bit_switch_put(struct snd_kcontrol *ctl,
{ {
struct oxygen *chip = ctl->private_data; struct oxygen *chip = ctl->private_data;
u16 bit = ctl->private_value; u16 bit = ctl->private_value;
bool invert = ctl->private_value & XONAR_GPIO_BIT_INVERT;
u16 old_bits, new_bits; u16 old_bits, new_bits;
int changed; int changed;
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
old_bits = oxygen_read16(chip, OXYGEN_GPIO_DATA); old_bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
if (value->value.integer.value[0]) if (!!value->value.integer.value[0] ^ invert)
new_bits = old_bits | bit; new_bits = old_bits | bit;
else else
new_bits = old_bits & ~bit; new_bits = old_bits & ~bit;

19
sound/pci/oxygen/xonar_pcm179x.c
View file

@ -776,6 +776,15 @@ static const struct snd_kcontrol_new os_128_control = {
.put = os_128_put, .put = os_128_put,
}; };
static const struct snd_kcontrol_new hdav_hdmi_control = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "HDMI Playback Switch",
.info = snd_ctl_boolean_mono_info,
.get = xonar_gpio_bit_switch_get,
.put = xonar_gpio_bit_switch_put,
.private_value = GPIO_HDAV_OUTPUT_ENABLE | XONAR_GPIO_BIT_INVERT,
};
static int st_output_switch_info(struct snd_kcontrol *ctl, static int st_output_switch_info(struct snd_kcontrol *ctl,
struct snd_ctl_elem_info *info) struct snd_ctl_elem_info *info)
{ {
@ -960,7 +969,15 @@ static int xonar_d2_mixer_init(struct oxygen *chip)
static int xonar_hdav_mixer_init(struct oxygen *chip) static int xonar_hdav_mixer_init(struct oxygen *chip)
{ {
return add_pcm1796_controls(chip); int err;
err = snd_ctl_add(chip->card, snd_ctl_new1(&hdav_hdmi_control, chip));
if (err < 0)
return err;
err = add_pcm1796_controls(chip);
if (err < 0)
return err;
return 0;
} }
static int xonar_st_mixer_init(struct oxygen *chip) static int xonar_st_mixer_init(struct oxygen *chip)