From a08fc2afa75fa5224aeda0f4042dd6d13cf20d83 Mon Sep 17 00:00:00 2001 From: mlelstv Date: Sun, 1 Mar 2015 07:05:59 +0000 Subject: Also unmap video memory when detaching console --- sys/dev/ic/vga.c | 5 +++-- sys/dev/ic/vga_raster.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'sys/dev') 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 -__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 -__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; -- cgit