Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:57:33 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_module.c
Log Message:
Set num_ioctls and enable DRIVER_MODESET in i915 module init.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 \
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.1.2.6 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.1.2.7
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.1.2.6 Wed Jul 24 03:57:19 2013
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c Wed Jul 24 03:57:33 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: i915_module.
#include <drm/drmP.h>
+#include "i915_drv.h"
+
MODULE(MODULE_CLASS_DRIVER, i915drm2, "drm2"); /* XXX drm2pci, drm2edid */
#ifdef _MODULE
@@ -57,6 +59,10 @@ i915drm2_modcmd(modcmd_t cmd, void *arg
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",
