[src/riastradh-drm2]: src/sys/external/bsd/drm2/i915drm Set num_ioctls and en...

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

details:   https://anonhg.NetBSD.org/src/rev/d4b34b9089e8
branches:  riastradh-drm2
changeset: 788471:d4b34b9089e8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:57:33 2013 +0000

description:
Set num_ioctls and enable DRIVER_MODESET in i915 module init.

diffstat:

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

diffs (38 lines):

diff -r db4439c86384 -r d4b34b9089e8 sys/external/bsd/drm2/i915drm/i915_module.c
--- a/sys/external/bsd/drm2/i915drm/i915_module.c       Wed Jul 24 03:57:19 2013 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_module.c       Wed Jul 24 03:57:33 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_module.c,v 1.1.2.6 2013/07/24 03:57:19 riastradh Exp $    */
+/*     $NetBSD: i915_module.c,v 1.1.2.7 2013/07/24 03:57:33 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.1.2.6 2013/07/24 03:57:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.1.2.7 2013/07/24 03:57:33 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -38,6 +38,8 @@
 
 #include <drm/drmP.h>
 
+#include "i915_drv.h"
+
 MODULE(MODULE_CLASS_DRIVER, i915drm2, "drm2"); /* XXX drm2pci, drm2edid */
 
 #ifdef _MODULE
@@ -57,6 +59,10 @@
        switch (cmd) {
        case MODULE_CMD_INIT:
 #ifdef _MODULE
+               /* XXX Kludge it up...  Must happen before attachment.  */
+               i915_drm_driver->num_ioctls = i915_max_ioctl;
+               i915_drm_driver->driver_features |= DRIVER_MODESET;
+
                error = drm_pci_init(i915_drm_driver, NULL);
                if (error) {
                        aprint_error("i915drm: failed to init pci: %d\n",