| Message ID | 20231212180253.2883124-4-kai.vehmanen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: hda/hdmi: align force-connect quirks with upstream | expand |
On Tue, 12 Dec 2023, Kai Vehmanen <kai.vehmanen@linux.intel.com> wrote: > This reverts commit 6fb89f11e23453b081ec4695e5e66ccb4deb2fd0. > > Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> > --- > sound/pci/hda/patch_hdmi.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c > index 5232c46a32a7..b152c941414f 100644 > --- a/sound/pci/hda/patch_hdmi.c > +++ b/sound/pci/hda/patch_hdmi.c > @@ -1993,7 +1993,6 @@ static const struct snd_pci_quirk force_connect_list[] = { > SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), > SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), > SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1), > - SND_PCI_QUIRK(0x1043, 0x8694, "ASUS", 1), /* SKL/KBL + PRIME B560M-A */ So there's no replacement for this commit. Is that correct? I've rebased topic/core-for-CI on top of v6.7-rc6, and everything else got resolved with the upstream commits but this. I left this one in for now, should I drop it? BR, Jani. > SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1), > SND_PCI_QUIRK(0x8086, 0x2060, "Intel NUC5CPYB", 1), > SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1),
Hi, On Mon, 18 Dec 2023, Jani Nikula wrote: > On Tue, 12 Dec 2023, Kai Vehmanen <kai.vehmanen@linux.intel.com> wrote: > > --- a/sound/pci/hda/patch_hdmi.c > > +++ b/sound/pci/hda/patch_hdmi.c > > @@ -1993,7 +1993,6 @@ static const struct snd_pci_quirk force_connect_list[] = { > > SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), > > SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), > > SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1), > > - SND_PCI_QUIRK(0x1043, 0x8694, "ASUS", 1), /* SKL/KBL + PRIME B560M-A */ > > So there's no replacement for this commit. Is that correct? > > I've rebased topic/core-for-CI on top of v6.7-rc6, and everything else > got resolved with the upstream commits but this. I left this one in for > now, should I drop it? yes, this can be dropped. This was reported in the bug report as one affected id, but it's not valid and I dropped in the series I sent upstream. The i915 CI had no failures with this dropped, so seems we are good to go. Br, Kai
On Mon, 18 Dec 2023, Kai Vehmanen <kai.vehmanen@linux.intel.com> wrote: > Hi, > > On Mon, 18 Dec 2023, Jani Nikula wrote: > >> On Tue, 12 Dec 2023, Kai Vehmanen <kai.vehmanen@linux.intel.com> wrote: >> > --- a/sound/pci/hda/patch_hdmi.c >> > +++ b/sound/pci/hda/patch_hdmi.c >> > @@ -1993,7 +1993,6 @@ static const struct snd_pci_quirk force_connect_list[] = { >> > SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), >> > SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), >> > SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1), >> > - SND_PCI_QUIRK(0x1043, 0x8694, "ASUS", 1), /* SKL/KBL + PRIME B560M-A */ >> >> So there's no replacement for this commit. Is that correct? >> >> I've rebased topic/core-for-CI on top of v6.7-rc6, and everything else >> got resolved with the upstream commits but this. I left this one in for >> now, should I drop it? > > yes, this can be dropped. This was reported in the bug report as one > affected id, but it's not valid and I dropped in the series I sent > upstream. The i915 CI had no failures with this dropped, so seems we are > good to go. Thanks, done. BR, Jani.
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 5232c46a32a7..b152c941414f 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1993,7 +1993,6 @@ static const struct snd_pci_quirk force_connect_list[] = { SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1), - SND_PCI_QUIRK(0x1043, 0x8694, "ASUS", 1), /* SKL/KBL + PRIME B560M-A */ SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1), SND_PCI_QUIRK(0x8086, 0x2060, "Intel NUC5CPYB", 1), SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1),
This reverts commit 6fb89f11e23453b081ec4695e5e66ccb4deb2fd0. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 1 - 1 file changed, 1 deletion(-)