From owner-svn-src-stable@freebsd.org Sun Jul 29 05:12:53 2018 Return-Path: Delivered-To: svn-src-stable@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 DD3BB104AF4D for ; Sun, 29 Jul 2018 05:12:52 +0000 (UTC) (envelope-from eadler@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A7067172C for ; Sun, 29 Jul 2018 05:12:52 +0000 (UTC) (envelope-from eadler@freebsd.org) Received: from mail-yb0-f171.google.com (mail-yb0-f171.google.com [209.85.213.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) (Authenticated sender: eadler) by smtp.freebsd.org (Postfix) with ESMTPSA id 498231E609 for ; Sun, 29 Jul 2018 05:12:52 +0000 (UTC) (envelope-from eadler@freebsd.org) Received: by mail-yb0-f171.google.com with SMTP id x15-v6so3571974ybm.2 for ; Sat, 28 Jul 2018 22:12:52 -0700 (PDT) X-Gm-Message-State: AOUpUlGiG5MROjA/XXaHNJdaPhbrI74jwpwqfRwvplhjDOpoAySjLXVs rDQmS7CVro5J08jmqFBpxyIazP+uv6FLrfh0s2ZUVQ== X-Google-Smtp-Source: AAOMgpedkrHCYgxiBUB1mPMtGPwfW0mh71GtudECmje0uhQCAiMJRtXL4HVoyJmZNvkXpOzjrqZhNsyYD/6ytH9Wc7w= X-Received: by 2002:a25:22c1:: with SMTP id i184-v6mr6677906ybi.479.1532841171700; Sat, 28 Jul 2018 22:12:51 -0700 (PDT) MIME-Version: 1.0 References: <201807280737.w6S7b12F025452@repo.freebsd.org> <20180728233405.GD40119@kib.kiev.ua> In-Reply-To: <20180728233405.GD40119@kib.kiev.ua> From: Eitan Adler Date: Sat, 28 Jul 2018 22:12:25 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r336805 - in stable/11: share/man/man4 sys/dev/vt/hw/vga To: Kostik Belousov Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2018 05:12:53 -0000 On Sat, 28 Jul 2018 at 16:34, Konstantin Belousov wrote: > > On Sat, Jul 28, 2018 at 07:37:01AM +0000, Eitan Adler wrote: > > Author: eadler > > Date: Sat Jul 28 07:37:01 2018 > > New Revision: 336805 > > URL: https://svnweb.freebsd.org/changeset/base/336805 > > > > Log: > > MFC r335629: > > > > vt: add option to ignore NO_VGA flag in ACPI > > > > To workaround buggy firmware that sets this flag when there's actually > > a VGA present. > > > > Ref D16003 > > PR: 229235 > > > > Modified: > > stable/11/share/man/man4/vt.4 > > stable/11/sys/dev/vt/hw/vga/vt_vga.c > > Directory Properties: > > stable/11/ (props changed) > > > > Modified: stable/11/share/man/man4/vt.4 > > ============================================================================== > > --- stable/11/share/man/man4/vt.4 Sat Jul 28 06:46:10 2018 (r336804) > > +++ stable/11/share/man/man4/vt.4 Sat Jul 28 07:37:01 2018 (r336805) > > @@ -44,6 +44,7 @@ > > In > > .Xr loader.conf 5 : > > .Cd hw.vga.textmode=1 > > +.Cd hw.vga.acpi_ignore_no_vga=1 > > .Cd kern.vty=vt > > .Cd kern.vt.color..rgb="" > > .Cd kern.vt.fb.default_mode="x" > > @@ -196,6 +197,10 @@ prompt or in > > Set to 1 to use virtual terminals in text mode instead of graphics mode. > > Features that require graphics mode, like loadable fonts, will be > > disabled. > > +.It Va hw.vga.acpi_ignore_no_vga > > +Set to 1 to force the usage of the VGA driver regardless of whether > > +ACPI IAPC_BOOT_ARCH signals no VGA support. > > +Can be used to workaround firmware bugs in the ACPI tables. > > .It Va kern.vty > > Set this value to > > .Ql vt > > > > Modified: stable/11/sys/dev/vt/hw/vga/vt_vga.c > > ============================================================================== > > --- stable/11/sys/dev/vt/hw/vga/vt_vga.c Sat Jul 28 06:46:10 2018 (r336804) > > +++ stable/11/sys/dev/vt/hw/vga/vt_vga.c Sat Jul 28 07:37:01 2018 (r336805) > > @@ -1211,6 +1211,12 @@ vga_acpi_disabled(void) > > ACPI_TABLE_FADT *fadt; > > vm_paddr_t physaddr; > > uint16_t flags; > > + int ignore; > > + > > + TUNABLE_INT_FETCH("hw.vga.acpi_ignore_no_vga", &ignore); > > + > > + if (ignore) > > + return (false); > If the tunable is not set, this code evaluates the stack garbage. > Why did you merged this without asking the author and not looking > at the followups ? Please assume some level of good faith. I MFCed this because I was asked to here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229235 over a month ago. During that time no one mentioned or linked any followups. I did look in my email for mentions of r335629 as well - of which there are none. Now that you mention it, I looked at the svn log and found r335631 which I will MFC as well. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams