From cfb9e8ec29be5233134b954a4dfbb21643fac41c Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Fri, 15 Apr 2016 10:11:43 +0100 Subject: [PATCH] igt/drv_module_reload_basic: Do not require snd-hda-intel Recent refactoring has made absence of snd-hda-intel a test failure do the respective modprobe being at the end of a reload function now. Only fail in this case if module was previously unloaded. Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson Reviewed-by: Chris Wilson --- tests/drv_module_reload_basic | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/drv_module_reload_basic b/tests/drv_module_reload_basic index fc508d72..3bba796f 100755 --- a/tests/drv_module_reload_basic +++ b/tests/drv_module_reload_basic @@ -11,6 +11,8 @@ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" # no other drm service should be running, so we can just unbind function reload() { + local snd_hda_intel_unloaded + echo Reloading i915.ko with $* # we must kick away fbcon (but only fbcon) @@ -23,7 +25,8 @@ function reload() { # The sound driver uses our power well pkill alsactl - rmmod snd_hda_intel &> /dev/null + snd_hda_intel_unloaded=0 + rmmod snd_hda_intel &> /dev/null && snd_hda_intel_unloaded=1 #ignore errors in ips - gen5 only rmmod intel_ips &> /dev/null @@ -47,7 +50,7 @@ function reload() { echo 1 > /sys/class/vtconsole/vtcon1/bind fi - modprobe snd_hda_intel + modprobe -q snd_hda_intel || return $snd_hda_intel_unloaded } function finish_load() {