Merge branch 'for-linus' into for-next
Back-merge of 4.15-rc development branch for further development of USB-audio stuff. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
commit
50947fb04f
|
@ -153,7 +153,9 @@ static int snd_pcm_control_ioctl(struct snd_card *card,
|
|||
err = -ENXIO;
|
||||
goto _error;
|
||||
}
|
||||
mutex_lock(&pcm->open_mutex);
|
||||
err = snd_pcm_info_user(substream, info);
|
||||
mutex_unlock(&pcm->open_mutex);
|
||||
_error:
|
||||
mutex_unlock(®ister_mutex);
|
||||
return err;
|
||||
|
|
|
@ -579,15 +579,14 @@ static int snd_rawmidi_info_user(struct snd_rawmidi_substream *substream,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info)
|
||||
static int __snd_rawmidi_info_select(struct snd_card *card,
|
||||
struct snd_rawmidi_info *info)
|
||||
{
|
||||
struct snd_rawmidi *rmidi;
|
||||
struct snd_rawmidi_str *pstr;
|
||||
struct snd_rawmidi_substream *substream;
|
||||
|
||||
mutex_lock(®ister_mutex);
|
||||
rmidi = snd_rawmidi_search(card, info->device);
|
||||
mutex_unlock(®ister_mutex);
|
||||
if (!rmidi)
|
||||
return -ENXIO;
|
||||
if (info->stream < 0 || info->stream > 1)
|
||||
|
@ -603,6 +602,16 @@ int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info
|
|||
}
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info)
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(®ister_mutex);
|
||||
ret = __snd_rawmidi_info_select(card, info);
|
||||
mutex_unlock(®ister_mutex);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(snd_rawmidi_info_select);
|
||||
|
||||
static int snd_rawmidi_info_select_user(struct snd_card *card,
|
||||
|
|
|
@ -355,7 +355,7 @@ static int initialize_timer(struct snd_seq_timer *tmr)
|
|||
unsigned long freq;
|
||||
|
||||
t = tmr->timeri->timer;
|
||||
if (snd_BUG_ON(!t))
|
||||
if (!t)
|
||||
return -EINVAL;
|
||||
|
||||
freq = tmr->preferred_resolution;
|
||||
|
|
|
@ -55,10 +55,11 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info");
|
|||
#define is_kabylake(codec) ((codec)->core.vendor_id == 0x8086280b)
|
||||
#define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \
|
||||
((codec)->core.vendor_id == 0x80862800))
|
||||
#define is_cannonlake(codec) ((codec)->core.vendor_id == 0x8086280c)
|
||||
#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \
|
||||
|| is_skylake(codec) || is_broxton(codec) \
|
||||
|| is_kabylake(codec)) || is_geminilake(codec)
|
||||
|
||||
|| is_kabylake(codec)) || is_geminilake(codec) \
|
||||
|| is_cannonlake(codec)
|
||||
#define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882)
|
||||
#define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883)
|
||||
#define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec))
|
||||
|
@ -3841,6 +3842,7 @@ HDA_CODEC_ENTRY(0x80862808, "Broadwell HDMI", patch_i915_hsw_hdmi),
|
|||
HDA_CODEC_ENTRY(0x80862809, "Skylake HDMI", patch_i915_hsw_hdmi),
|
||||
HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI", patch_i915_hsw_hdmi),
|
||||
HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI", patch_i915_hsw_hdmi),
|
||||
HDA_CODEC_ENTRY(0x8086280c, "Cannonlake HDMI", patch_i915_glk_hdmi),
|
||||
HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI", patch_i915_glk_hdmi),
|
||||
HDA_CODEC_ENTRY(0x80862800, "Geminilake HDMI", patch_i915_glk_hdmi),
|
||||
HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi),
|
||||
|
|
|
@ -330,6 +330,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
|
|||
case 0x10ec0236:
|
||||
case 0x10ec0255:
|
||||
case 0x10ec0256:
|
||||
case 0x10ec0257:
|
||||
case 0x10ec0282:
|
||||
case 0x10ec0283:
|
||||
case 0x10ec0286:
|
||||
|
@ -2772,6 +2773,7 @@ enum {
|
|||
ALC269_TYPE_ALC298,
|
||||
ALC269_TYPE_ALC255,
|
||||
ALC269_TYPE_ALC256,
|
||||
ALC269_TYPE_ALC257,
|
||||
ALC269_TYPE_ALC215,
|
||||
ALC269_TYPE_ALC225,
|
||||
ALC269_TYPE_ALC294,
|
||||
|
@ -2805,6 +2807,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
|
|||
case ALC269_TYPE_ALC298:
|
||||
case ALC269_TYPE_ALC255:
|
||||
case ALC269_TYPE_ALC256:
|
||||
case ALC269_TYPE_ALC257:
|
||||
case ALC269_TYPE_ALC215:
|
||||
case ALC269_TYPE_ALC225:
|
||||
case ALC269_TYPE_ALC294:
|
||||
|
@ -5182,6 +5185,22 @@ static void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec,
|
|||
}
|
||||
}
|
||||
|
||||
/* Forcibly assign NID 0x03 to HP/LO while NID 0x02 to SPK for EQ */
|
||||
static void alc274_fixup_bind_dacs(struct hda_codec *codec,
|
||||
const struct hda_fixup *fix, int action)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
static hda_nid_t preferred_pairs[] = {
|
||||
0x21, 0x03, 0x1b, 0x03, 0x16, 0x02,
|
||||
0
|
||||
};
|
||||
|
||||
if (action != HDA_FIXUP_ACT_PRE_PROBE)
|
||||
return;
|
||||
|
||||
spec->gen.preferred_dacs = preferred_pairs;
|
||||
}
|
||||
|
||||
/* for hda_fixup_thinkpad_acpi() */
|
||||
#include "thinkpad_helper.c"
|
||||
|
||||
|
@ -5299,6 +5318,8 @@ enum {
|
|||
ALC233_FIXUP_LENOVO_MULTI_CODECS,
|
||||
ALC294_FIXUP_LENOVO_MIC_LOCATION,
|
||||
ALC700_FIXUP_INTEL_REFERENCE,
|
||||
ALC274_FIXUP_DELL_BIND_DACS,
|
||||
ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
|
||||
};
|
||||
|
||||
static const struct hda_fixup alc269_fixups[] = {
|
||||
|
@ -6109,6 +6130,21 @@ static const struct hda_fixup alc269_fixups[] = {
|
|||
{}
|
||||
}
|
||||
},
|
||||
[ALC274_FIXUP_DELL_BIND_DACS] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc274_fixup_bind_dacs,
|
||||
.chained = true,
|
||||
.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
|
||||
},
|
||||
[ALC274_FIXUP_DELL_AIO_LINEOUT_VERB] = {
|
||||
.type = HDA_FIXUP_PINS,
|
||||
.v.pins = (const struct hda_pintbl[]) {
|
||||
{ 0x1b, 0x0401102f },
|
||||
{ }
|
||||
},
|
||||
.chained = true,
|
||||
.chain_id = ALC274_FIXUP_DELL_BIND_DACS
|
||||
},
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
|
@ -6575,7 +6611,7 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
|
|||
{0x14, 0x90170110},
|
||||
{0x1b, 0x90a70130},
|
||||
{0x21, 0x03211020}),
|
||||
SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
|
||||
SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
|
||||
{0x12, 0xb7a60130},
|
||||
{0x13, 0xb8a61140},
|
||||
{0x16, 0x90170110},
|
||||
|
@ -6867,6 +6903,10 @@ static int patch_alc269(struct hda_codec *codec)
|
|||
spec->gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */
|
||||
alc_update_coef_idx(codec, 0x36, 1 << 13, 1 << 5); /* Switch pcbeep path to Line in path*/
|
||||
break;
|
||||
case 0x10ec0257:
|
||||
spec->codec_variant = ALC269_TYPE_ALC257;
|
||||
spec->gen.mixer_nid = 0;
|
||||
break;
|
||||
case 0x10ec0215:
|
||||
case 0x10ec0285:
|
||||
case 0x10ec0289:
|
||||
|
@ -7914,6 +7954,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
|
|||
HDA_CODEC_ENTRY(0x10ec0236, "ALC236", patch_alc269),
|
||||
HDA_CODEC_ENTRY(0x10ec0255, "ALC255", patch_alc269),
|
||||
HDA_CODEC_ENTRY(0x10ec0256, "ALC256", patch_alc269),
|
||||
HDA_CODEC_ENTRY(0x10ec0257, "ALC257", patch_alc269),
|
||||
HDA_CODEC_ENTRY(0x10ec0260, "ALC260", patch_alc260),
|
||||
HDA_CODEC_ENTRY(0x10ec0262, "ALC262", patch_alc262),
|
||||
HDA_CODEC_ENTRY(0x10ec0267, "ALC267", patch_alc268),
|
||||
|
|
|
@ -204,6 +204,10 @@ static int snd_usb_copy_string_desc(struct mixer_build *state,
|
|||
int index, char *buf, int maxlen)
|
||||
{
|
||||
int len = usb_string(state->chip->dev, index, buf, maxlen - 1);
|
||||
|
||||
if (len < 0)
|
||||
return 0;
|
||||
|
||||
buf[len] = 0;
|
||||
return len;
|
||||
}
|
||||
|
@ -2169,19 +2173,25 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid,
|
|||
kctl->private_value = (unsigned long)namelist;
|
||||
kctl->private_free = usb_mixer_selector_elem_free;
|
||||
|
||||
nameid = uac_selector_unit_iSelector(desc);
|
||||
/* check the static mapping table at first */
|
||||
len = check_mapped_name(map, kctl->id.name, sizeof(kctl->id.name));
|
||||
if (len)
|
||||
;
|
||||
else if (nameid)
|
||||
snd_usb_copy_string_desc(state, nameid, kctl->id.name,
|
||||
sizeof(kctl->id.name));
|
||||
else {
|
||||
len = get_term_name(state, &state->oterm,
|
||||
if (!len) {
|
||||
/* no mapping ? */
|
||||
/* if iSelector is given, use it */
|
||||
nameid = uac_selector_unit_iSelector(desc);
|
||||
if (nameid)
|
||||
len = snd_usb_copy_string_desc(state, nameid,
|
||||
kctl->id.name,
|
||||
sizeof(kctl->id.name));
|
||||
/* ... or pick up the terminal name at next */
|
||||
if (!len)
|
||||
len = get_term_name(state, &state->oterm,
|
||||
kctl->id.name, sizeof(kctl->id.name), 0);
|
||||
/* ... or use the fixed string "USB" as the last resort */
|
||||
if (!len)
|
||||
strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name));
|
||||
|
||||
/* and add the proper suffix */
|
||||
if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR)
|
||||
append_ctl_name(kctl, " Clock Source");
|
||||
else if ((state->oterm.type & 0xff00) == 0x0100)
|
||||
|
|
|
@ -1166,10 +1166,11 @@ static bool is_marantz_denon_dac(unsigned int id)
|
|||
/* TEAC UD-501/UD-503/NT-503 USB DACs need a vendor cmd to switch
|
||||
* between PCM/DOP and native DSD mode
|
||||
*/
|
||||
static bool is_teac_50X_dac(unsigned int id)
|
||||
static bool is_teac_dsd_dac(unsigned int id)
|
||||
{
|
||||
switch (id) {
|
||||
case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-503/NT-503 */
|
||||
case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
@ -1202,7 +1203,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs,
|
|||
break;
|
||||
}
|
||||
mdelay(20);
|
||||
} else if (is_teac_50X_dac(subs->stream->chip->usb_id)) {
|
||||
} else if (is_teac_dsd_dac(subs->stream->chip->usb_id)) {
|
||||
/* Vendor mode switch cmd is required. */
|
||||
switch (fmt->altsetting) {
|
||||
case 3: /* DSD mode (DSD_U32) requested */
|
||||
|
@ -1392,7 +1393,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
|
|||
}
|
||||
|
||||
/* TEAC devices with USB DAC functionality */
|
||||
if (is_teac_50X_dac(chip->usb_id)) {
|
||||
if (is_teac_dsd_dac(chip->usb_id)) {
|
||||
if (fp->altsetting == 3)
|
||||
return SNDRV_PCM_FMTBIT_DSD_U32_BE;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue