From owner-svn-src-head@freebsd.org Mon Apr 8 04:07:38 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C44E15732FC;
Mon, 8 Apr 2019 04:07:38 +0000 (UTC) (envelope-from bde@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 21F0D85A4C;
Mon, 8 Apr 2019 04:07:38 +0000 (UTC) (envelope-from bde@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED5221E172;
Mon, 8 Apr 2019 04:07:37 +0000 (UTC) (envelope-from bde@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3847bLL001700;
Mon, 8 Apr 2019 04:07:37 GMT (envelope-from bde@FreeBSD.org)
Received: (from bde@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3847boA001699;
Mon, 8 Apr 2019 04:07:37 GMT (envelope-from bde@FreeBSD.org)
Message-Id: <201904080407.x3847boA001699@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org
using -f
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 8 Apr 2019 04:07:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r346024 - head/usr.sbin/vidcontrol
X-SVN-Group: head
X-SVN-Commit-Author: bde
X-SVN-Commit-Paths: head/usr.sbin/vidcontrol
X-SVN-Commit-Revision: 346024
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 21F0D85A4C
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.95 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
NEURAL_HAM_SHORT(-0.95)[-0.953,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Apr 2019 04:07:38 -0000
Author: bde
Date: Mon Apr 8 04:07:37 2019
New Revision: 346024
URL: https://svnweb.freebsd.org/changeset/base/346024
Log:
Fix restoring the geometry when recovering from an error. Just restore the
previous geometry, and don't do extra work to calculate the default geometry
so as to reset to that.
Modified:
head/usr.sbin/vidcontrol/vidcontrol.c
Modified: head/usr.sbin/vidcontrol/vidcontrol.c
==============================================================================
--- head/usr.sbin/vidcontrol/vidcontrol.c Mon Apr 8 03:35:47 2019 (r346023)
+++ head/usr.sbin/vidcontrol/vidcontrol.c Mon Apr 8 04:07:37 2019 (r346024)
@@ -171,9 +171,8 @@ revert(void)
else
ioctl(0, _IO('S', cur_info.video_mode_number), NULL);
if (cur_info.video_mode_info.vi_flags & V_INFO_GRAPHICS) {
- size[0] = cur_info.video_mode_info.vi_width / 8;
- size[1] = cur_info.video_mode_info.vi_height /
- cur_info.console_info.font_size;
+ size[0] = cur_info.console_info.mv_csz;
+ size[1] = cur_info.console_info.mv_rsz;
size[2] = cur_info.console_info.font_size;
ioctl(0, KDRASTER, size);
}