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 <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Tvrtko Ursulin 2016-04-15 10:11:43 +01:00
parent da3ae5c861
commit cfb9e8ec29

View File

@ -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() {