Module Name: src
Committed By: mlelstv
Date: Sun Jul 13 01:17:15 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_pci.c
Log Message:
The vga driver now detaches wscons.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.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.9 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.10
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.9 Tue Jul 1 20:03:21 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Sun Jul 13 01:17:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.9 2014/07/01 20:03:21 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.10 2014/07/13 01:17:15 mlelstv 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.9 2014/07/01 20:03:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.10 2014/07/13 01:17:15 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -211,11 +211,9 @@ i915drm_attach(device_t parent, device_t
* which kernel messages will go into a black hole,
* until genfb replays the console. Whattakludge.
*
- * wsdisplay_cndetach must come first, to clear cn_tab,
- * so that nothing will use it; then vga_cndetach
- * unmaps the bus space that it would have used.
+ * vga_cndetach detaches wscons and unmaps the bus space
+ * that it would have used.
*/
- wsdisplay_cndetach();
vga_cndetach();
} else
#endif
