[src/trunk]: src/sys/external/bsd/drm2/i915drm The vga driver now detaches ws...

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

details:   https://anonhg.NetBSD.org/src/rev/9162d4e00c96
branches:  trunk
changeset: 330521:9162d4e00c96
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Jul 13 01:17:15 2014 +0000

description:
The vga driver now detaches wscons.

diffstat:

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

diffs (32 lines):

diff -r 712ab278eb28 -r 9162d4e00c96 sys/external/bsd/drm2/i915drm/i915_pci.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci.c  Sun Jul 13 01:02:20 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci.c  Sun Jul 13 01:17:15 2014 +0000
@@ -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 @@
                 * 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