[Intel-gfx] [i-g-t PATCH 3/3] igt/drv_module_reload_basic: let intel_ips removal errors through

Jani Nikula jani.nikula at intel.com
Mon Oct 3 14:20:32 UTC 2016


Only try removing intel_ips if it's actually loaded, and let the errors
through to the logs if removal fails.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 tests/drv_module_reload_basic | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/drv_module_reload_basic b/tests/drv_module_reload_basic
index a221d65f725a..93cf7c005638 100755
--- a/tests/drv_module_reload_basic
+++ b/tests/drv_module_reload_basic
@@ -36,8 +36,10 @@ function reload() {
 		rmmod snd_hda_intel && snd_hda_intel_unloaded=1
 	fi
 
-	#ignore errors in ips - gen5 only
-	rmmod intel_ips &> /dev/null
+	# gen5 only
+	if mod_loaded intel_ips; then
+		rmmod intel_ips
+	fi
 	rmmod i915 || return $IGT_EXIT_SKIP
 	#ignore errors in intel-gtt, often built-in
 	rmmod intel-gtt &> /dev/null
-- 
2.1.4



More information about the Intel-gfx mailing list