dkms: optimize the dg2 kernel driver loading time

Tracked-On: OAM-124024 Signed-off-by: Wang, Yiyang <[email protected]>
projectceladon · Aug 30, 2024 · 0e97737 · 0e97737
1 parent 5aff8c2
commit 0e97737
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 7 deletions.
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
@@ -22,6 +22,8 @@
  *
  */
 
+#include <linux/firmware.h>
+
 #include <drm/drm_color_mgmt.h>
 #include <drm/drm_drv.h>
 #include <drm/i915_pciids.h>
@@ -1022,6 +1024,33 @@ static bool intel_mmio_bar_valid(struct pci_dev *pdev, struct intel_device_info
 	return i915_pci_resource_valid(pdev, intel_mmio_bar(intel_info->__runtime.graphics.ip.ver));
 }
 
+extern int gfx_load_module(void *buf, int len);
+
+static void gfx_out_of_tree_load(struct device *dev)
+{
+	const struct firmware *fw = NULL;
+	int err;
+	void *buf;
+
+	err = firmware_request_nowarn(&fw, "i915/compat.ko", dev);
+	buf = __vmalloc((unsigned long)fw->size, GFP_KERNEL | __GFP_NOWARN);
+	memcpy(buf, fw->data, fw->size);
+	gfx_load_module(buf, fw->size);
+	DRM_INFO("i915/compat.ko load status: %d\n", err);
+
+	err = firmware_request_nowarn(&fw, "i915/intel_vsec.ko", dev);
+	buf = __vmalloc((unsigned long)fw->size, GFP_KERNEL | __GFP_NOWARN);
+	memcpy(buf, fw->data, fw->size);
+	gfx_load_module(buf, fw->size);
+	DRM_INFO("i915/intel_vsec.ko load status: %d\n", err);
+
+	err = firmware_request_nowarn(&fw, "i915/i915_ag.ko", dev);
+	buf = __vmalloc((unsigned long)fw->size, GFP_KERNEL | __GFP_NOWARN);
+	memcpy(buf, fw->data, fw->size);
+	gfx_load_module(buf, fw->size);
+	DRM_INFO("i915/i915_ag.ko load status: %d\n", err);
+}
+
 static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	struct intel_device_info *intel_info =
@@ -1087,6 +1116,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		return err > 0 ? -ENOTTY : err;
 	}
 
+	gfx_out_of_tree_load(&pdev->dev);
 	return 0;
 }
 

diff --git a/kernel/module/main.c b/kernel/module/main.c
@@ -2734,7 +2734,7 @@ static int unknown_module_param_cb(char *param, char *val, const char *modname,
  * zero, and we rely on this for optional sections.
  */
 static int load_module(struct load_info *info, const char __user *uargs,
-		       int flags)
+		       int flags, bool no_args)
 {
 	struct module *mod;
 	long err = 0;
@@ -2861,10 +2861,17 @@ static int load_module(struct load_info *info, const char __user *uargs,
 	flush_module_icache(mod);
 
 	/* Now copy in args */
-	mod->args = strndup_user(uargs, ~0UL >> 1);
-	if (IS_ERR(mod->args)) {
-		err = PTR_ERR(mod->args);
-		goto free_arch_cleanup;
+	if (!no_args) {
+		mod->args = strndup_user(uargs, ~0UL >> 1);
+		if (IS_ERR(mod->args)) {
+			pr_debug("%s mod->args error\n", __func__);
+			err = PTR_ERR(mod->args);
+			goto free_arch_cleanup;
+		}
+		pr_debug("%s mod->args: %llx \n", __func__, (u64)mod->args);
+	} else {
+		char *arg = "";
+		mod->args = kmemdup(arg, strlen(arg) + 1, GFP_KERNEL);
 	}
 
 	init_build_id(mod, info);
@@ -2977,7 +2984,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
 	if (err)
 		return err;
 
-	return load_module(&info, uargs, 0);
+	return load_module(&info, uargs, 0, false);
 }
 
 SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
@@ -3013,7 +3020,15 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
 		info.len = len;
 	}
 
-	return load_module(&info, uargs, flags);
+	return load_module(&info, uargs, flags, false);
+}
+
+int gfx_load_module(void *buf, int len)
+{
+	struct load_info info = { };
+	info.hdr = buf;
+	info.len = len;
+	return load_module(&info, NULL, 0, true);
 }
 
 static inline int within(unsigned long addr, void *start, unsigned long size)