Module Name: src
Committed By: nonaka
Date: Thu Feb 23 12:16:30 UTC 2017
Modified Files:
src/sys/dev/rasops: rasops.c
Log Message:
reset ri->ri_hwbits too if RI_CFGDONE is set.
prevent ri->ri_hwbits from moving to center every time rasops_reconfig() is
called when RI_CENTER is set.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/rasops/rasops.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/dev/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.73 src/sys/dev/rasops/rasops.c:1.74
--- src/sys/dev/rasops/rasops.c:1.73 Sat Apr 18 11:23:58 2015
+++ src/sys/dev/rasops/rasops.c Thu Feb 23 12:16:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.73 2015/04/18 11:23:58 mlelstv Exp $ */
+/* $NetBSD: rasops.c,v 1.74 2017/02/23 12:16:30 nonaka Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.73 2015/04/18 11:23:58 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.74 2017/02/23 12:16:30 nonaka Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
@@ -325,8 +325,10 @@ rasops_reconfig(struct rasops_info *ri,
/* Need this to frob the setup below */
bpp = (ri->ri_depth == 15 ? 16 : ri->ri_depth);
- if ((ri->ri_flg & RI_CFGDONE) != 0)
+ if ((ri->ri_flg & RI_CFGDONE) != 0) {
ri->ri_bits = ri->ri_origbits;
+ ri->ri_hwbits = ri->ri_hworigbits;
+ }
/* Don't care if the caller wants a hideously small console */
if (wantrows < 10)
