CVS commit: src/sys/external/bsd/drm2

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 11:13:30 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: i915_buddy.c
        src/sys/external/bsd/drm2/i915drm: i915_module.c

Log Message:
i915: Call i915_global_buddy_init from i915 module init.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_buddy.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/i915drm/i915_module.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_buddy.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_buddy.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_buddy.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_buddy.c:1.3	Sun Dec 19 11:13:22 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_buddy.c	Sun Dec 19 11:13:30 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_buddy.c,v 1.3 2021/12/19 11:13:22 riastradh Exp $	*/
+/*	$NetBSD: i915_buddy.c,v 1.4 2021/12/19 11:13:30 riastradh Exp $	*/
 
 // SPDX-License-Identifier: MIT
 /*
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_buddy.c,v 1.3 2021/12/19 11:13:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_buddy.c,v 1.4 2021/12/19 11:13:30 riastradh Exp $");
 
 #include <linux/err.h>
 #include <linux/kmemleak.h>
@@ -38,6 +38,10 @@ static struct i915_global_block global =
 	.exit = i915_global_buddy_exit,
 } };
 
+#ifdef __NetBSD__
+#define	__init	/* called from i915_module.c */
+#endif
+
 int __init i915_global_buddy_init(void)
 {
 	global.slab_blocks = KMEM_CACHE(i915_buddy_block, SLAB_HWCACHE_ALIGN);

Index: src/sys/external/bsd/drm2/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.10 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.11
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.10	Sun Dec 19 10:32:59 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c	Sun Dec 19 11:13:30 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_module.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $	*/
+/*	$NetBSD: i915_module.c,v 1.11 2021/12/19 11:13:30 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.11 2021/12/19 11:13:30 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -52,6 +52,8 @@ MODULE(MODULE_CLASS_DRIVER, i915drmkms, 
 
 struct drm_sysctl_def i915_def = DRM_SYSCTL_INIT();
 
+int i915_global_buddy_init(void); /* XXX */
+
 static int
 i915drmkms_init(void)
 {
@@ -61,6 +63,10 @@ i915drmkms_init(void)
 	if (error)
 		return error;
 
+	error = -i915_global_buddy_init();
+	if (error)
+		return error;
+
 	drm_sysctl_init(&i915_def);
 	spin_lock_init(&mchdev_lock);