diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-04-15 10:11:43 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-04-15 11:26:45 +0100 |
| commit | cfb9e8ec29be5233134b954a4dfbb21643fac41c (patch) | |
| tree | 47ceaa0d779ddc92566e40862cfbb932858d0f31 /tests/drv_module_reload_basic | |
| parent | da3ae5c8619f437d9bc8a954b98896a6afdef045 (diff) | |
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>
Diffstat (limited to 'tests/drv_module_reload_basic')
| -rwxr-xr-x | tests/drv_module_reload_basic | 7 |
1 files 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() { |