Module Name: src
Committed By: riastradh
Date: Wed Jan 29 19:47:09 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 \
src/sys/external/bsd/drm2/i915drm/i915_pci.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_pci.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.9 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.10
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.9 Wed Jan 22 14:58:39 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Wed Jan 29 19:47:09 2014
@@ -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 @@ i915drm_attach(device_t parent, device_t
/* 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
