[PATCH] drm/i915, HD-audio: Don't continue probing when nomodeset is given

[Takashi Iwai]

At Fri, 13 Jun 2014 18:07:06 +0200,
Daniel Vetter wrote:
> 
> On Fri, Jun 13, 2014 at 05:56:02PM +0200, Takashi Iwai wrote:
> > When a machine is booted with nomodeset option, i915 driver skips the
> > whole initialization.  Meanwhile, HD-audio tries to bind wth i915 just
> > by request_symbol() without knowing that the initialization was
> > skipped, and eventually it hits WARN_ON() in i915_request_power_well()
> > and i915_release_power_well() wrongly but still continues probing,
> > even though it doesn't work at all.
> > 
> > In this patch, both functions are changed to return an error in case
> > of uninitialized state instead of WARN_ON(), so that HD-audio driver
> > can give up HDMI controller initialization at the right time.
> > 
> > Cc: <stable at vger.kernel.org> [3.15]
> > Signed-off-by: Takashi Iwai <tiwai at suse.de>
> 
> Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> 
> I guess you'll merge this through the sound tree?

Yes, if you don't mind it.


thanks,

Takashi