[src/riastradh-drm2]: src/sys/external/bsd/drm2/i915drm Defer i915drm_attach_...

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

details:   https://anonhg.NetBSD.org/src/rev/6ab78e654e44
branches:  riastradh-drm2
changeset: 788628:6ab78e654e44
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jan 29 19:47:09 2014 +0000

description:
Defer i915drm_attach_framebuffer until interrupts are running.

The i915 code initialization relies on counting hardclock ticks for a
delay (ugh).

Not an issue for modules, but it will matter when we build drm2 into
the kernel proper.

diffstat:

 sys/external/bsd/drm2/i915drm/i915_pci.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 75b831eb3896 -r 6ab78e654e44 sys/external/bsd/drm2/i915drm/i915_pci.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci.c  Wed Jan 29 19:46:51 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci.c  Wed Jan 29 19:47:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_pci.c,v 1.1.2.9 2014/01/22 14:58:39 riastradh Exp $       */
+/*     $NetBSD: i915_pci.c,v 1.1.2.10 2014/01/29 19:47:09 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.1.2.9 2014/01/22 14:58:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.1.2.10 2014/01/29 19:47:09 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -154,7 +154,8 @@
        /* Attach the drm driver.  */
        drm_config_found(self, i915_drm_driver, flags, &sc->sc_drm_dev);
 
-       i915drm_attach_framebuffer(self);
+       /* Attach a framebuffer, but not until interrupts work.  */
+       config_interrupts(self, &i915drm_attach_framebuffer);
 }
 
 static int