[Intel-gfx] [PATCH i-g-t 1/2] lib/kmod: Fail if the module is already loaded

[Chris Wilson]

If we want to set new module options, we must load the module or die
trying. We may want to always fail if the module if already loaded, but
for now, take the small incremental step and insist that the options are
set if requested.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 lib/igt_kmod.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
index 4f70e30d9..f3f34a62d 100644
--- a/lib/igt_kmod.c
+++ b/lib/igt_kmod.c
@@ -141,7 +141,13 @@ out:
 
 static int modprobe(struct kmod_module *kmod, const char *options)
 {
-	return kmod_module_probe_insert_module(kmod, 0, options,
+	unsigned int flags;
+
+	flags = 0;
+	if (options) /* force a fresh load to set the new options */
+		flags |= KMOD_PROBE_FAIL_ON_LOADED;
+
+	return kmod_module_probe_insert_module(kmod, flags, options,
 					       NULL, NULL, NULL);
 }
 
-- 
2.18.0