mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 15:40:56 +07:00
ALSA: hda/hdmi: Add quirk to force connectivity
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@canonical.com> Link: https://lore.kernel.org/r/20200804155836.16252-1-kai.heng.feng@canonical.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
559ff03fa3
commit
cd72c317a0
@ -165,6 +165,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 */
|
||||
|
||||
@ -1758,7 +1759,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;
|
||||
|
||||
/*
|
||||
@ -1860,11 +1862,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) {
|
||||
@ -1872,6 +1881,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
|
||||
|
Loading…
Reference in New Issue
Block a user