summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-06-13 15:14:34 +0200
committerTakashi Iwai <tiwai@suse.de>2014-06-16 10:34:06 +0200
commit74b0c2d75fb4cc89173944e6d8f9eb47aca0c343 (patch)
treefa5d2e9b60d699e7d22e9f1b128f0299452e20a4 /include/drm
parentLinux 3.16-rc1 (diff)
downloadlinux-74b0c2d75fb4cc89173944e6d8f9eb47aca0c343.tar.xz
linux-74b0c2d75fb4cc89173944e6d8f9eb47aca0c343.zip
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>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/i915_powerwell.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/i915_powerwell.h b/include/drm/i915_powerwell.h
index cfdc884405b7..2baba9996094 100644
--- a/include/drm/i915_powerwell.h
+++ b/include/drm/i915_powerwell.h
@@ -30,7 +30,7 @@
#define _I915_POWERWELL_H_
/* For use by hda_i915 driver */
-extern void i915_request_power_well(void);
-extern void i915_release_power_well(void);
+extern int i915_request_power_well(void);
+extern int i915_release_power_well(void);
#endif /* _I915_POWERWELL_H_ */