Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 01:41:35 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/i915drm: i915_module.c

Log Message:
No more load-time hacking of the struct drm_driver structure, yay!


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.8 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.9
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.8	Tue Aug 28 03:35:08 2018
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c	Sun Dec 19 01:41:35 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_module.c,v 1.8 2018/08/28 03:35:08 riastradh Exp $	*/
+/*	$NetBSD: i915_module.c,v 1.9 2021/12/19 01:41:35 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.8 2018/08/28 03:35:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.9 2021/12/19 01:41:35 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -50,11 +50,6 @@ MODULE(MODULE_CLASS_DRIVER, i915drmkms, 
 #include "ioconf.c"
 #endif
 
-/* XXX Kludge to get these from i915_drv.c.  */
-extern struct drm_driver *const i915_drm_driver;
-extern const struct pci_device_id *const i915_device_ids;
-extern const size_t i915_n_device_ids;
-
 struct drm_sysctl_def i915_def = DRM_SYSCTL_INIT();
 
 static int
@@ -66,10 +61,6 @@ i915drmkms_init(void)
 	if (error)
 		return error;
 
-	i915_drm_driver->num_ioctls = i915_max_ioctl;
-	i915_drm_driver->driver_features |= DRIVER_MODESET;
-	i915_drm_driver->driver_features &= ~DRIVER_USE_AGP;
-
 	drm_sysctl_init(&i915_def);
 	spin_lock_init(&mchdev_lock);
 

Reply via email to