summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authormlelstv <mlelstv@NetBSD.org>2015-03-01 07:05:59 +0000
committermlelstv <mlelstv@NetBSD.org>2015-03-01 07:05:59 +0000
commita08fc2afa75fa5224aeda0f4042dd6d13cf20d83 (patch)
treeadc0e760a754f701a9c290dc2a9b93684075e221 /sys/dev/ic
parent425d7adcb20d21599b2c0d2750f4791836a9ca21 (diff)
Also unmap video memory when detaching console
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/vga.c5
-rw-r--r--sys/dev/ic/vga_raster.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 6fbc83e6fd4..209ed34a905 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.114 2015/01/14 17:45:27 chs Exp $ */
+/* $NetBSD: vga.c,v 1.115 2015/03/01 07:05:59 mlelstv Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.114 2015/01/14 17:45:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.115 2015/03/01 07:05:59 mlelstv Exp $");
#include "opt_vga.h"
/* for WSCONS_SUPPORT_PCVTFONTS */
@@ -725,6 +725,7 @@ vga_cndetach(void)
bus_space_unmap(vh->vh_iot, vh->vh_ioh_vga, 0x10);
bus_space_unmap(vh->vh_iot, vh->vh_ioh_6845, 0x10);
+ bus_space_unmap(vh->vh_memt, vh->vh_allmemh, 0x20000);
vga_console_attached = 0;
vgaconsole = 0;
diff --git a/sys/dev/ic/vga_raster.c b/sys/dev/ic/vga_raster.c
index 2b3c7ee03f6..3ea44b6f369 100644
--- a/sys/dev/ic/vga_raster.c
+++ b/sys/dev/ic/vga_raster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.43 2015/01/14 17:45:27 chs Exp $ */
+/* $NetBSD: vga_raster.c,v 1.44 2015/03/01 07:05:59 mlelstv Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.43 2015/01/14 17:45:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.44 2015/03/01 07:05:59 mlelstv Exp $");
#include "opt_vga.h"
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -567,6 +567,7 @@ vga_cndetach(void)
bus_space_unmap(vh->vh_iot, vh->vh_ioh_vga, 0x10);
bus_space_unmap(vh->vh_iot, vh->vh_ioh_6845, 0x10);
+ bus_space_unmap(vh->vh_memt, vh->vh_allmemh, 0x20000);
vga_console_attached = 0;
vgaconsole = 0;