[src/trunk]: src/sys/external/bsd/drm2/i915drm No more load-time hacking of t...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f43be5c9b831
branches:  trunk
changeset: 1028032:f43be5c9b831
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 01:41:35 2021 +0000

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

diffstat:

 sys/external/bsd/drm2/i915drm/i915_module.c |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (41 lines):

diff -r a87f4e6dcf8b -r f43be5c9b831 sys/external/bsd/drm2/i915drm/i915_module.c
--- a/sys/external/bsd/drm2/i915drm/i915_module.c       Sun Dec 19 01:41:27 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_module.c       Sun Dec 19 01:41:35 2021 +0000
@@ -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 @@
 #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 @@
        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);