- Alsa-devel - mailman.alsa-project.org

[PATCH] sound: pci: delete repeated words in comments
by Randy Dunlap 06 Aug '20

06 Aug '20

Drop duplicated words in sound/pci/. {and, the, at} Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Cc: Clemens Ladisch <clemens(a)ladisch.de> --- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/patch_sigmatel.c | 2 +- sound/pci/ice1712/prodigy192.c | 2 +- sound/pci/oxygen/xonar_dg.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) --- linux-next-20200805.orig/sound/pci/cs46xx/cs46xx_lib.c +++ linux-next-20200805/sound/pci/cs46xx/cs46xx_lib.c @@ -766,7 +766,7 @@ static void snd_cs46xx_set_capture_sampl rate = 48000 / 9; /* - * We can not capture at at rate greater than the Input Rate (48000). + * We can not capture at a rate greater than the Input Rate (48000). * Return an error if an attempt is made to stray outside that limit. */ if (rate > 48000) --- linux-next-20200805.orig/sound/pci/cs46xx/dsp_spos_scb_lib.c +++ linux-next-20200805/sound/pci/cs46xx/dsp_spos_scb_lib.c @@ -1716,7 +1716,7 @@ int cs46xx_iec958_pre_open (struct snd_c struct dsp_spos_instance * ins = chip->dsp_spos_instance; if ( ins->spdif_status_out & DSP_SPDIF_STATUS_OUTPUT_ENABLED ) { - /* remove AsynchFGTxSCB and and PCMSerialInput_II */ + /* remove AsynchFGTxSCB and PCMSerialInput_II */ cs46xx_dsp_disable_spdif_out (chip); /* save state */ --- linux-next-20200805.orig/sound/pci/hda/hda_codec.c +++ linux-next-20200805/sound/pci/hda/hda_codec.c @@ -3428,7 +3428,7 @@ EXPORT_SYMBOL_GPL(snd_hda_set_power_save * @nid: NID to check / update * * Check whether the given NID is in the amp list. If it's in the list, - * check the current AMP status, and update the the power-status according + * check the current AMP status, and update the power-status according * to the mute status. * * This function is supposed to be set or called from the check_power_status --- linux-next-20200805.orig/sound/pci/hda/hda_generic.c +++ linux-next-20200805/sound/pci/hda/hda_generic.c @@ -813,7 +813,7 @@ static void activate_amp_in(struct hda_c } } -/* sync power of each widget in the the given path */ +/* sync power of each widget in the given path */ static hda_nid_t path_power_update(struct hda_codec *codec, struct nid_path *path, bool allow_powerdown) --- linux-next-20200805.orig/sound/pci/hda/patch_sigmatel.c +++ linux-next-20200805/sound/pci/hda/patch_sigmatel.c @@ -838,7 +838,7 @@ static int stac_auto_create_beep_ctls(st static const struct snd_kcontrol_new beep_vol_ctl = HDA_CODEC_VOLUME(NULL, 0, 0, 0); - /* check for mute support for the the amp */ + /* check for mute support for the amp */ if ((caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT) { const struct snd_kcontrol_new *temp; if (spec->anabeep_nid == nid) --- linux-next-20200805.orig/sound/pci/ice1712/prodigy192.c +++ linux-next-20200805/sound/pci/ice1712/prodigy192.c @@ -32,7 +32,7 @@ * Experimentally I found out that only a combination of * OCKS0=1, OCKS1=1 (128fs, 64fs output) and ice1724 - * VT1724_MT_I2S_MCLK_128X=0 (256fs input) yields correct - * sampling rate. That means the the FPGA doubles the + * sampling rate. That means that the FPGA doubles the * MCK01 rate. * * Copyright (c) 2003 Takashi Iwai <tiwai(a)suse.de> --- linux-next-20200805.orig/sound/pci/oxygen/xonar_dg.c +++ linux-next-20200805/sound/pci/oxygen/xonar_dg.c @@ -29,7 +29,7 @@ * GPIO 4 <- headphone detect * GPIO 5 -> enable ADC analog circuit for the left channel * GPIO 6 -> enable ADC analog circuit for the right channel - * GPIO 7 -> switch green rear output jack between CS4245 and and the first + * GPIO 7 -> switch green rear output jack between CS4245 and the first * channel of CS4361 (mechanical relay) * GPIO 8 -> enable output to speakers *

2 1

[PATCH] sound: isa: delete repeated words in comments
by Randy Dunlap 06 Aug '20

06 Aug '20

Drop duplicated words in sound/isa/. {be, bit} Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org --- sound/isa/cs423x/cs4236_lib.c | 2 +- sound/isa/es18xx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux-next-20200805.orig/sound/isa/cs423x/cs4236_lib.c +++ linux-next-20200805/sound/isa/cs423x/cs4236_lib.c @@ -39,7 +39,7 @@ * D7: consumer serial port enable (CS4237B,CS4238B) * D6: channels status block reset (CS4237B,CS4238B) * D5: user bit in sub-frame of digital audio data (CS4237B,CS4238B) - * D4: validity bit bit in sub-frame of digital audio data (CS4237B,CS4238B) + * D4: validity bit in sub-frame of digital audio data (CS4237B,CS4238B) * * C5 lower channel status (digital serial data description) (CS4237B,CS4238B) * D7-D6: first two bits of category code --- linux-next-20200805.orig/sound/isa/es18xx.c +++ linux-next-20200805/sound/isa/es18xx.c @@ -955,7 +955,7 @@ static int snd_es18xx_info_mux(struct sn case 0x1887: case 0x1888: return snd_ctl_enum_info(uinfo, 1, 5, texts5Source); - case 0x1869: /* DS somewhat contradictory for 1869: could be be 5 or 8 */ + case 0x1869: /* DS somewhat contradictory for 1869: could be 5 or 8 */ case 0x1879: return snd_ctl_enum_info(uinfo, 1, 8, texts8Source); default:

2 1

[PATCH] soc: qmi: allow user to set handle wq to hiprio
by 王文虎 05 Aug '20

05 Aug '20

Currently the qmi_handle is initialized single threaded and strictly ordered with the active set to 1. This is pretty simple and safe but sometimes ineffency. So it is better to allow user to decide whether a high priority workqueue should be used. Signed-off-by: Wang Wenhu <wenhu.wang(a)vivo.com> --- drivers/net/ipa/ipa_qmi.c | 4 ++-- drivers/net/wireless/ath/ath10k/qmi.c | 2 +- drivers/net/wireless/ath/ath11k/qmi.c | 2 +- drivers/remoteproc/qcom_sysmon.c | 2 +- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++-- drivers/soc/qcom/pdr_interface.c | 4 ++-- drivers/soc/qcom/qmi_interface.c | 9 +++++++-- include/linux/soc/qcom/qmi.h | 3 ++- samples/qmi/qmi_sample_client.c | 4 ++-- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/net/ipa/ipa_qmi.c b/drivers/net/ipa/ipa_qmi.c index 5090f0f923ad..d78b0fe6bd83 100644 --- a/drivers/net/ipa/ipa_qmi.c +++ b/drivers/net/ipa/ipa_qmi.c @@ -486,7 +486,7 @@ int ipa_qmi_setup(struct ipa *ipa) */ ret = qmi_handle_init(&ipa_qmi->server_handle, IPA_QMI_SERVER_MAX_RCV_SZ, &ipa_server_ops, - ipa_server_msg_handlers); + ipa_server_msg_handlers, 0); if (ret) return ret; @@ -500,7 +500,7 @@ int ipa_qmi_setup(struct ipa *ipa) */ ret = qmi_handle_init(&ipa_qmi->client_handle, IPA_QMI_CLIENT_MAX_RCV_SZ, &ipa_client_ops, - ipa_client_msg_handlers); + ipa_client_msg_handlers, 0); if (ret) goto err_server_handle_release; diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c index 5468a41e928e..02881882b4d9 100644 --- a/drivers/net/wireless/ath/ath10k/qmi.c +++ b/drivers/net/wireless/ath/ath10k/qmi.c @@ -1034,7 +1034,7 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size) ret = qmi_handle_init(&qmi->qmi_hdl, WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN, - &ath10k_qmi_ops, qmi_msg_handler); + &ath10k_qmi_ops, qmi_msg_handler, 0); if (ret) goto err; diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c index c00a99ad8dbc..91394d58d36e 100644 --- a/drivers/net/wireless/ath/ath11k/qmi.c +++ b/drivers/net/wireless/ath/ath11k/qmi.c @@ -2397,7 +2397,7 @@ int ath11k_qmi_init_service(struct ath11k_base *ab) ab->qmi.target_mem_mode = ATH11K_QMI_TARGET_MEM_MODE_DEFAULT; ret = qmi_handle_init(&ab->qmi.handle, ATH11K_QMI_RESP_LEN_MAX, - &ath11k_qmi_ops, ath11k_qmi_msg_handlers); + &ath11k_qmi_ops, ath11k_qmi_msg_handlers, 0); if (ret < 0) { ath11k_warn(ab, "failed to initialize qmi handle\n"); return ret; diff --git a/drivers/remoteproc/qcom_sysmon.c b/drivers/remoteproc/qcom_sysmon.c index 8d8996d714f0..4ec470e424ef 100644 --- a/drivers/remoteproc/qcom_sysmon.c +++ b/drivers/remoteproc/qcom_sysmon.c @@ -614,7 +614,7 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc, } ret = qmi_handle_init(&sysmon->qmi, SSCTL_MAX_MSG_LEN, &ssctl_ops, - qmi_indication_handler); + qmi_indication_handler, 0); if (ret < 0) { dev_err(sysmon->dev, "failed to initialize qmi handle\n"); kfree(sysmon); diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 743ee7b4e63f..ba76691fc5a5 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -446,7 +446,7 @@ static int qcom_slim_qmi_init(struct qcom_slim_ngd_ctrl *ctrl, return -ENOMEM; rc = qmi_handle_init(handle, SLIMBUS_QMI_POWER_REQ_MAX_MSG_LEN, - NULL, qcom_slim_qmi_msg_handlers); + NULL, qcom_slim_qmi_msg_handlers, 0); if (rc < 0) { dev_err(ctrl->dev, "QMI client init failed: %d\n", rc); goto qmi_handle_init_failed; @@ -1293,7 +1293,7 @@ static int qcom_slim_ngd_qmi_svc_event_init(struct qcom_slim_ngd_ctrl *ctrl) int ret; ret = qmi_handle_init(&qmi->svc_event_hdl, 0, - &qcom_slim_ngd_qmi_svc_event_ops, NULL); + &qcom_slim_ngd_qmi_svc_event_ops, NULL, 0); if (ret < 0) { dev_err(ctrl->dev, "qmi_handle_init failed: %d\n", ret); return ret; diff --git a/drivers/soc/qcom/pdr_interface.c b/drivers/soc/qcom/pdr_interface.c index bdcf16f88a97..cc1cb90c1968 100644 --- a/drivers/soc/qcom/pdr_interface.c +++ b/drivers/soc/qcom/pdr_interface.c @@ -685,7 +685,7 @@ struct pdr_handle *pdr_handle_alloc(void (*status)(int state, ret = qmi_handle_init(&pdr->locator_hdl, SERVREG_GET_DOMAIN_LIST_RESP_MAX_LEN, - &pdr_locator_ops, NULL); + &pdr_locator_ops, NULL, 0); if (ret < 0) goto destroy_indack; @@ -696,7 +696,7 @@ struct pdr_handle *pdr_handle_alloc(void (*status)(int state, ret = qmi_handle_init(&pdr->notifier_hdl, SERVREG_STATE_UPDATED_IND_MAX_LEN, &pdr_notifier_ops, - qmi_indication_handler); + qmi_indication_handler, 0); if (ret < 0) goto release_qmi_handle; diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c index 1a03eaa38c46..01160dbfc4d0 100644 --- a/drivers/soc/qcom/qmi_interface.c +++ b/drivers/soc/qcom/qmi_interface.c @@ -609,6 +609,7 @@ static struct socket *qmi_sock_create(struct qmi_handle *qmi, * @recv_buf_size: maximum size of incoming message * @ops: reference to callbacks for QRTR notifications * @handlers: NULL-terminated list of QMI message handlers + * @hiprio: whether high priority worker is used for workqueue * * This initializes the QMI client handle to allow sending and receiving QMI * messages. As messages are received the appropriate handler will be invoked. @@ -617,9 +618,11 @@ static struct socket *qmi_sock_create(struct qmi_handle *qmi, */ int qmi_handle_init(struct qmi_handle *qmi, size_t recv_buf_size, const struct qmi_ops *ops, - const struct qmi_msg_handler *handlers) + const struct qmi_msg_handler *handlers, + unsigned int hiprio) { int ret; + unsigned int flags = WQ_UNBOUND; mutex_init(&qmi->txn_lock); mutex_init(&qmi->sock_lock); @@ -647,7 +650,9 @@ int qmi_handle_init(struct qmi_handle *qmi, size_t recv_buf_size, if (!qmi->recv_buf) return -ENOMEM; - qmi->wq = alloc_workqueue("qmi_msg_handler", WQ_UNBOUND, 1); + if (hiprio) + flags |= WQ_HIGHPRI; + qmi->wq = alloc_workqueue("qmi_msg_handler", flags, 1); if (!qmi->wq) { ret = -ENOMEM; goto err_free_recv_buf; diff --git a/include/linux/soc/qcom/qmi.h b/include/linux/soc/qcom/qmi.h index e712f94b89fc..24062fd7163d 100644 --- a/include/linux/soc/qcom/qmi.h +++ b/include/linux/soc/qcom/qmi.h @@ -244,7 +244,8 @@ int qmi_add_server(struct qmi_handle *qmi, unsigned int service, int qmi_handle_init(struct qmi_handle *qmi, size_t max_msg_len, const struct qmi_ops *ops, - const struct qmi_msg_handler *handlers); + const struct qmi_msg_handler *handlers, + unsigned int hiprio); void qmi_handle_release(struct qmi_handle *qmi); ssize_t qmi_send_request(struct qmi_handle *qmi, struct sockaddr_qrtr *sq, diff --git a/samples/qmi/qmi_sample_client.c b/samples/qmi/qmi_sample_client.c index c9e7276c3d83..a91d1633ea38 100644 --- a/samples/qmi/qmi_sample_client.c +++ b/samples/qmi/qmi_sample_client.c @@ -463,7 +463,7 @@ static int qmi_sample_probe(struct platform_device *pdev) ret = qmi_handle_init(&sample->qmi, TEST_DATA_REQ_MAX_MSG_LEN_V01, NULL, - qmi_sample_handlers); + qmi_sample_handlers, 0); if (ret < 0) return ret; @@ -590,7 +590,7 @@ static int qmi_sample_init(void) if (ret) goto err_remove_debug_dir; - ret = qmi_handle_init(&lookup_client, 0, &lookup_ops, NULL); + ret = qmi_handle_init(&lookup_client, 0, &lookup_ops, NULL, 0); if (ret < 0) goto err_unregister_driver; -- 2.17.1

3 3

[PATCH v2 0/3] Tegra Specific fixes
by Mohan Kumar 05 Aug '20

05 Aug '20

This series proposes following fixes to Tegra HDA driver. * Align the buffer to 128 bytes for Tegra. * Add new behavior flag dma_stop_delay in hdac_bus structure. * Add 100us as dma stop delay for Tegra. Mohan Kumar (3): ASoC: hda/tegra: Set buffer alignment to 128 bytes ALSA: hda: Add dma stop delay variable ALSA: hda/tegra: Add 100us dma stop delay include/sound/hdaudio.h | 3 +++ sound/hda/hdac_stream.c | 7 +++++++ sound/pci/hda/hda_tegra.c | 3 +++ 3 files changed, 13 insertions(+) -- 2.17.1

2 4

[PATCH 0/3] Tegra Specific fixes
by Mohan Kumar 05 Aug '20

05 Aug '20

This series proposes following fixes to Tegra HDA driver. * Align the buffer to 128 bytes for Tegra. * Add new behavior flag dma_stop_delay in hdac_bus structure. * Add 100us as dma stop delay for Tegra. Mohan Kumar (3): ASoC: hda/tegra: Set buffer alignment to 128 bytes ALSA: hda: Add behaviour flag for dma stop delay ALSA: hda/tegra: Add 100us dma stop delay include/sound/hdaudio.h | 2 ++ sound/hda/hdac_stream.c | 7 +++++++ sound/pci/hda/hda_tegra.c | 3 +++ 3 files changed, 12 insertions(+) -- 2.17.1

2 4

[PATCH v2 0/2] refine and clean code for synchronous mode
by Shengjiu Wang 05 Aug '20

05 Aug '20

refine and clean code for synchronous mode Shengjiu Wang (2): ASoC: fsl_sai: Clean code for synchronous mode ASoC: fsl_sai: Refine enable and disable sequence for synchronous mode changes in v2: - Split the commit - refine the sequence in trigger stop sound/soc/fsl/fsl_sai.c | 133 ++++++++++++++++++++++++++-------------- 1 file changed, 86 insertions(+), 47 deletions(-) -- 2.27.0

3 6

[PATCH] ALSA: seq: oss: Serialize ioctls
by Takashi Iwai 04 Aug '20

04 Aug '20

Some ioctls via OSS sequencer API may race and lead to UAF when the port create and delete are performed concurrently, as spotted by a couple of syzkaller cases. This patch is an attempt to address it by serializing the ioctls with the existing register_mutex. Basically OSS sequencer API is an obsoleted interface and was designed without much consideration of the concurrency. There are very few applications with it, and the concurrent performance isn't asked, hence this "big hammer" approach should be good enough. Reported-by: syzbot+1a54a94bd32716796edd(a)syzkaller.appspotmail.com Reported-by: syzbot+9d2abfef257f3e2d4713(a)syzkaller.appspotmail.com Suggested-by: Hillf Danton <hdanton(a)sina.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/oss/seq_oss.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c index 17f913657304..c8b9c0b315d8 100644 --- a/sound/core/seq/oss/seq_oss.c +++ b/sound/core/seq/oss/seq_oss.c @@ -168,10 +168,16 @@ static long odev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct seq_oss_devinfo *dp; + long rc; + dp = file->private_data; if (snd_BUG_ON(!dp)) return -ENXIO; - return snd_seq_oss_ioctl(dp, cmd, arg); + + mutex_lock(&register_mutex); + rc = snd_seq_oss_ioctl(dp, cmd, arg); + mutex_unlock(&register_mutex); + return rc; } #ifdef CONFIG_COMPAT -- 2.16.4

1 0

[PATCH v3] ALSA: hda/hdmi: Add quirk to force connectivity
by Kai-Heng Feng 04 Aug '20

04 Aug '20

HDMI on some platforms doesn't enable audio support because its Port Connectivity [31:30] is set to AC_JACK_PORT_NONE: Node 0x05 [Pin Complex] wcaps 0x40778d: 8-Channels Digital Amp-Out CP Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x0b000094: OUT Detect HBR HDMI DP Pin Default 0x58560010: [N/A] Digital Out at Int HDMI Conn = Digital, Color = Unknown DefAssociation = 0x1, Sequence = 0x0 Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D3 EPSS Power: setting=D0, actual=D0 Devices: 0 Connection: 3 0x02 0x03* 0x04 For now, use a quirk to force connectivity based on SSID. If there are more platforms affected by the same issue, we can eye for a more generic solution. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- v3: - Move the flag into hdmi_spec. v2: - Use a quirk list instead. sound/pci/hda/patch_hdmi.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index cd46247988e4..b62cd3abb827 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -160,6 +160,7 @@ struct hdmi_spec { bool use_acomp_notifier; /* use eld_notify callback for hotplug */ bool acomp_registered; /* audio component registered in this driver */ + bool force_connect; /* force connectivity */ struct drm_audio_component_audio_ops drm_audio_ops; int (*port2pin)(struct hda_codec *, int); /* reverse port/pin mapping */ @@ -1701,7 +1702,8 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) * all device entries on the same pin */ config = snd_hda_codec_get_pincfg(codec, pin_nid); - if (get_defcfg_connect(config) == AC_JACK_PORT_NONE) + if (get_defcfg_connect(config) == AC_JACK_PORT_NONE && + !spec->force_connect) return 0; /* @@ -1803,11 +1805,18 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) return 0; } +static const struct snd_pci_quirk force_connect_list[] = { + SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), + {} +}; + static int hdmi_parse_codec(struct hda_codec *codec) { + struct hdmi_spec *spec = codec->spec; hda_nid_t start_nid; unsigned int caps; int i, nodes; + const struct snd_pci_quirk *q; nodes = snd_hda_get_sub_nodes(codec, codec->core.afg, &start_nid); if (!start_nid || nodes < 0) { @@ -1815,6 +1824,11 @@ static int hdmi_parse_codec(struct hda_codec *codec) return -EINVAL; } + q = snd_pci_quirk_lookup(codec->bus->pci, force_connect_list); + + if (q && q->value) + spec->force_connect = true; + /* * hdmi_add_pin() assumes total amount of converters to * be known, so first discover all converters -- 2.17.1

2 1

Lenovo m720s combined audio jack not working (ALC233)
by Bastien Nocera 04 Aug '20

04 Aug '20

Hey, The front audio jack on my newly purchased (but not new) Lenovo m720s doesn't make a microphone output appear in PulseAudio when a headset is plugged in. The headphone part works correctly though. The "sof-hda-dsp Front Headphone" evdev device will switch the state of SW_HEADPHONE_INSERT as expected. Does anyone know whether the headphones/headset switching is supposed to be automatic, or would that trigger a "what did you plug in" dialogue as on some Dell machines I've worked with? I couldn't find any quirks in sound/pci/hda that would be directly related to this problem (eg. Lenovo, ALC233 and mic presence), so I'm a bit stumped. I've attached the pinout information from alsa-info. Any ideas? Cheers

2 5

[PATCH v2] ALSA: hda/hdmi: Add quirk to force connectivity
by Kai-Heng Feng 04 Aug '20

04 Aug '20

HDMI on some platforms doesn't enable audio support because its Port Connectivity [31:30] is set to AC_JACK_PORT_NONE: Node 0x05 [Pin Complex] wcaps 0x40778d: 8-Channels Digital Amp-Out CP Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x0b000094: OUT Detect HBR HDMI DP Pin Default 0x58560010: [N/A] Digital Out at Int HDMI Conn = Digital, Color = Unknown DefAssociation = 0x1, Sequence = 0x0 Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D3 EPSS Power: setting=D0, actual=D0 Devices: 0 Connection: 3 0x02 0x03* 0x04 For now, use a quirk to force connectivity based on SSID. If there are more platforms affected by the same issue, we can eye for a more generic solution. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- v2: - Use a quirk list instead. include/sound/hda_codec.h | 1 + sound/pci/hda/patch_hdmi.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index d16a4229209b..947cba68d9fe 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -254,6 +254,7 @@ struct hda_codec { unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */ + unsigned int force_connect:1; /* force connectivity */ #ifdef CONFIG_PM unsigned long power_on_acct; diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index cd46247988e4..40d4f0e0e3d7 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1701,7 +1701,8 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) * all device entries on the same pin */ config = snd_hda_codec_get_pincfg(codec, pin_nid); - if (get_defcfg_connect(config) == AC_JACK_PORT_NONE) + if (get_defcfg_connect(config) == AC_JACK_PORT_NONE && + !codec->force_connect) return 0; /* @@ -1803,11 +1804,17 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) return 0; } +static const struct snd_pci_quirk force_connect_list[] = { + SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), + {} +}; + static int hdmi_parse_codec(struct hda_codec *codec) { hda_nid_t start_nid; unsigned int caps; int i, nodes; + const struct snd_pci_quirk *q; nodes = snd_hda_get_sub_nodes(codec, codec->core.afg, &start_nid); if (!start_nid || nodes < 0) { @@ -1815,6 +1822,11 @@ static int hdmi_parse_codec(struct hda_codec *codec) return -EINVAL; } + q = snd_pci_quirk_lookup(codec->bus->pci, force_connect_list); + + if (q && q->value) + codec->force_connect = 1; + /* * hdmi_add_pin() assumes total amount of converters to * be known, so first discover all converters -- 2.17.1

2 1