]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
drm/i915, HD-audio: Don't continue probing when nomodeset is given
authorTakashi Iwai <tiwai@suse.de>
Fri, 13 Jun 2014 13:14:34 +0000 (15:14 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 5 Nov 2014 09:03:19 +0000 (10:03 +0100)
commitfcb1eed7baee724ca62f157df7684e99edd4145a
tree699891b538d5806cf9031292fbe43e17f86b109c
parent92f4ce188b5d85a7c26809b830994caf5625b3e8
drm/i915, HD-audio: Don't continue probing when nomodeset is given

commit 74b0c2d75fb4cc89173944e6d8f9eb47aca0c343 upstream.

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.

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: <stable@vger.kernel.org> [3.15]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/gpu/drm/i915/intel_pm.c
include/drm/i915_powerwell.h
sound/pci/hda/hda_i915.c
sound/pci/hda/hda_i915.h
sound/pci/hda/hda_intel.c