[v2,2/2] ALSA: hda/intel: Move snd_hdac_i915_init to before probe_work.

Commit Message

Maarten Lankhorst July 18, 2023, 11:58 a.m. UTC

Now that we can use -EPROBE_DEFER, it's no longer required to spin off
the snd_hdac_i915_init into a workqueue.

Use the -EPROBE_DEFER mechanism instead, which must be returned in the
probe function.

Changes since v1:
- Use dev_err_probe()
- Don't move probed_devs bitmap unnecessarily. (tiwai)
- Use goto out_azx_free after cleanup of error path. (tiwai)
- Move snd_hdac_i915_init slightly upward, to ensure
   it's always initialised before vga-switcheroo is called.

Signed-off-by: Maarten Lankhorst<[e-mail]>
---
  sound/pci/hda/hda_intel.c | 60 ++++++++++++++++++++-------------------
  1 file changed, 31 insertions(+), 29 deletions(-)

Patch

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 196ca76ac43ad..59039a1f01035 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2147,6 +2147,36 @@  static int azx_probe(struct pci_dev *pci,
  
  	pci_set_drvdata(pci, card);
  
+#ifdef CONFIG_SND_HDA_I915
+	/* bind with i915 if needed */
+	if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {
+		err = snd_hdac_i915_init(azx_bus(chip), false);
+		if (err < 0) {
+			/* if the controller is bound only with HDMI/DP
+			 * (for HSW and BDW), we need to abort the probe;
+			 * for other chips, still continue probing as other
+			 * codecs can be on the same link.
+			 */
+			if (CONTROLLER_IN_GPU(pci)) {
+				dev_err_probe(card->dev, err,
+					     "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
+
+				goto out_azx_free;
+			} else {
+				/* don't bother any longer */
+				chip->driver_caps &= ~AZX_DCAPS_I915_COMPONENT;
+			}
+		}
+
+		/* HSW/BDW controllers need this power */
+		if (CONTROLLER_IN_GPU(pci))
+			hda->need_i915_power = true;
+	}
+#else
+	if (CONTROLLER_IN_GPU(pci))
+		dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
+#endif
+
  	err = register_vga_switcheroo(chip);
  	if (err < 0) {
  		dev_err(card->dev, "Error registering vga_switcheroo client\n");
@@ -2174,11 +2205,6 @@  static int azx_probe(struct pci_dev *pci,
  	}
  #endif /* CONFIG_SND_HDA_PATCH_LOADER */
  
-#ifndef CONFIG_SND_HDA_I915
-	if (CONTROLLER_IN_GPU(pci))
-		dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
-#endif
-
  	if (schedule_probe)
  		schedule_delayed_work(&hda->probe_work, 0);
  
@@ -2277,30 +2303,6 @@  static int azx_probe_continue(struct azx *chip)
  	to_hda_bus(bus)->bus_probing = 1;
  	hda->probe_continued = 1;
  
-	/* bind with i915 if needed */
-	if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {
-		err = snd_hdac_i915_init(bus, true);
-		if (err < 0) {
-			/* if the controller is bound only with HDMI/DP
-			 * (for HSW and BDW), we need to abort the probe;
-			 * for other chips, still continue probing as other
-			 * 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 */
-				chip->driver_caps &= ~AZX_DCAPS_I915_COMPONENT;
-			}
-		}
-
-		/* HSW/BDW controllers need this power */
-		if (CONTROLLER_IN_GPU(pci))
-			hda->need_i915_power = true;
-	}
-
  	/* Request display power well for the HDA controller or codec. For
  	 * Haswell/Broadwell, both the display HDA controller and codec need
  	 * this power. For other platforms, like Baytrail/Braswell, only the