[Intel-gfx] [PATCH] Revert "HAX sound: Disable probing snd_hda with DG1"

* [Intel-gfx] [PATCH] Revert "HAX sound: Disable probing snd_hda with DG1"
@ 2021-02-12 14:53 Kai Vehmanen
  2021-02-12 15:22 ` Chris Wilson
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Kai Vehmanen @ 2021-02-12 14:53 UTC (permalink / raw)
  To: intel-gfx; +Cc: lucas.demarchi, Chris Wilson

This reverts commit 3632610d38316bca9b0cd9d649ce3cefab58520a.

DG1 has been supported in upstream since v5.10 with commit
69b08bdfa818 ("ALSA: hda - add Intel DG1 PCI and HDMI ids").

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 sound/hda/hdac_i915.c     | 23 -----------------------
 sound/pci/hda/hda_intel.c |  2 ++
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index fbca4bf53a47..454474ac5716 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -128,26 +128,6 @@ static bool i915_gfx_present(void)
 	return pci_dev_present(ids);
 }
 
-static bool dg1_gfx_present(void)
-{
-	static const struct pci_device_id ids[] = {
-		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4905),
-		  .class = PCI_BASE_CLASS_DISPLAY << 16,
-		  .class_mask = 0xff << 16 },
-		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4906),
-		  .class = PCI_BASE_CLASS_DISPLAY << 16,
-		  .class_mask = 0xff << 16 },
-		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4907),
-		  .class = PCI_BASE_CLASS_DISPLAY << 16,
-		  .class_mask = 0xff << 16 },
-		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4908),
-		  .class = PCI_BASE_CLASS_DISPLAY << 16,
-		  .class_mask = 0xff << 16 },
-		{}
-	};
-	return pci_dev_present(ids);
-}
-
 /**
  * snd_hdac_i915_init - Initialize i915 audio component
  * @bus: HDA core bus
@@ -168,9 +148,6 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
 	if (!i915_gfx_present())
 		return -ENODEV;
 
-	if (dg1_gfx_present())
-		return -ENODEV;
-
 	err = snd_hdac_acomp_init(bus, NULL,
 				  i915_component_master_match,
 				  sizeof(struct i915_audio_component) - sizeof(*acomp));
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index bdd5b01b0222..5a50d3a46445 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2293,6 +2293,8 @@ static int azx_probe_continue(struct azx *chip)
 			 * codecs can be on the same link.
 			 */
 			if (CONTROLLER_IN_GPU(pci)) {
+				dev_err(chip->card->dev,
+					"HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
 				goto out_free;
 			} else {
 				/* don't bother any longer */

base-commit: be9bde5a8b7b5cff58bd01c8ca094d571295c40b
-- 
2.29.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread