]> git.baikalelectronics.ru Git - kernel.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)
committerTakashi Iwai <tiwai@suse.de>
Mon, 16 Jun 2014 08:34:06 +0000 (10:34 +0200)
commit9dec6c6af3b52378b4f7d06059f1a2f5fe22bd69
treefa5d2e9b60d699e7d22e9f1b128f0299452e20a4
parent29230ba12c9ebdc4bb6e22babcaec9dfa3d76ff4
drm/i915, HD-audio: Don't continue probing when nomodeset is given

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>
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