[Intel-gfx] [PATCH v2 1/3] drm/i915/hda: Add audio component stub

[Takashi Iwai]

On Tue, 17 May 2016 14:53:40 +0200,
Takashi Iwai wrote:
> 
> On Tue, 17 May 2016 14:39:26 +0200,
> Daniel Vetter wrote:
> > 
> > And if we _really_ want this to work at runtime too, then we need a
> > system-wide nomodeset option that snd-hda can look up and act accordingly.
> 
> Yes, this would be one option.

And I noticed that this can be easily added to patch 3, just like i915
driver does:

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index c9af022676c2..c48a014be7b4 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -361,6 +361,11 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
 	if (WARN_ON(hdac_acomp))
 		return -EBUSY;
 
+#ifdef CONFIG_VGA_CONSOLE
+	if (vgacon_text_force())
+		return -ENODEV;
+#endif
+
 	if (!i915_gfx_present())
 		return -ENODEV;
 

It's hackish, but should work practically enough...


Takashi