summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfcambus <fcambus@openbsd.org>2019-03-28 14:35:29 +0000
committerfcambus <fcambus@openbsd.org>2019-03-28 14:35:29 +0000
commit3ad1404ffd06c2f22594a2f8b2477a217ef3cc58 (patch)
tree361bc0caf83c2d23b74976665530d57b314610a7
parentDon't send MIDI-related flow control messages until at least (diff)
downloadwireguard-openbsd-3ad1404ffd06c2f22594a2f8b2477a217ef3cc58.tar.xz
wireguard-openbsd-3ad1404ffd06c2f22594a2f8b2477a217ef3cc58.zip
Revert revision 1.20, switch back to using efifb_std_descr.n{rows,cols}
instead of EFIFB_HEIGHT and EFIFB_WIDTH when calling rasops_init() in efifb_cnremap() and efifb_attach(). This appeared to cause issues on some systems, as reported by Dmitry on bugs@.
-rw-r--r--sys/arch/amd64/amd64/efifb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/efifb.c b/sys/arch/amd64/amd64/efifb.c
index f3b368fc0dc..2a4b44084bd 100644
--- a/sys/arch/amd64/amd64/efifb.c
+++ b/sys/arch/amd64/amd64/efifb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: efifb.c,v 1.22 2019/03/25 14:17:58 fcambus Exp $ */
+/* $OpenBSD: efifb.c,v 1.23 2019/03/28 14:35:29 fcambus Exp $ */
/*
* Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -219,7 +219,7 @@ efifb_attach(struct device *parent, struct device *self, void *aux)
ri->ri_flg &= ~RI_CLEAR;
ri->ri_flg |= RI_VCONS | RI_WRONLY;
- rasops_init(ri, EFIFB_HEIGHT, EFIFB_WIDTH);
+ rasops_init(ri, efifb_std_descr.nrows, efifb_std_descr.ncols);
ri->ri_ops.alloc_attr(ri->ri_active, 0, 0, 0, &defattr);
wsdisplay_cnattach(&efifb_std_descr, ri->ri_active, ccol, crow,
@@ -467,7 +467,7 @@ efifb_cnremap(void)
ri->ri_flg &= ~RI_CLEAR;
ri->ri_flg |= RI_CENTER | RI_WRONLY;
- rasops_init(ri, EFIFB_HEIGHT, EFIFB_WIDTH);
+ rasops_init(ri, efifb_std_descr.nrows, efifb_std_descr.ncols);
}
int