From owner-svn-src-head@freebsd.org Wed Jul 20 07:44:33 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 198F0B9CEFE; Wed, 20 Jul 2016 07:44:33 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pa0-x229.google.com (mail-pa0-x229.google.com [IPv6:2607:f8b0:400e:c03::229]) (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)) by mx1.freebsd.org (Postfix) with ESMTPS id DB89711EA; Wed, 20 Jul 2016 07:44:32 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pa0-x229.google.com with SMTP id fi15so15793710pac.1; Wed, 20 Jul 2016 00:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=UHN6yCn41HEEcjSdVLd/VhnYrF1UYxm86NaEn+K5L/U=; b=YFjVVAGmIRDpET6wOtvNRdB3Yb91XePtli5xGgcr5uKzVNRa6XxgZBLJTVneKXe/l2 hoZuOexqWznfGtDm2uRgYXYiZnNx/prB6vw4SXWo+KqalSW76cJrWQPf8RdBJhP/rm9I LH32h+TxMjEJyZx/dlG2lHNnkXxUo56fQyy7HeBrjZY7cdBc8P3jeJFXLWteHAq17GCX uIF+QFlIlNK3p8G9OADed6nnEvtnahiuO5HbPw1Y52JiAZ5mFRHo39KamLwM7Fry/k7L NE4Ozh59Esq2uqspSjrv/6wGGuhWICTAnhfklYugdTE2TD4IonOb86e7fZUGwT4dIedG 2oAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:reply-to:subject:references:to:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding; bh=UHN6yCn41HEEcjSdVLd/VhnYrF1UYxm86NaEn+K5L/U=; b=dCKIPfEuS3w/Qyr0HUOK9T3xBzahGkuS62caMylqA6FhGU3KuRtylHrGGnxh24OrHT ayC0+TayQsSPUpLsksnziW5FOEJ1xG9AerZ/2PZSuRgjw19u1Q9/Cbpo7S50gGJ1Zozd J8slMgvyWFH5xrFo2wT2SsGJghng7uNABd9tYRmX5CvGFeK3xH/oo9Q2/iNAD/3OQxT0 MzEHuFzE9kJq3mGOl5RYb8eoB2kHqs0vBL6WP9Kv7BudLa6zxWtP+jDTvFQq3U7ZsYex e5B8AhzaxhqipUjiQGmGW38XSP3Z1JYgttjBjUDm7kfyBGUFqES5DMZofYS2aW2VUBSS 9z4Q== X-Gm-Message-State: ALyK8tIRCRVAbpTOqRUr/yCd3y48F+TlG32N53ru+zwv8NxTZItva1zglXgLK1+4pVnwIw== X-Received: by 10.66.219.105 with SMTP id pn9mr72291097pac.25.1469000672192; Wed, 20 Jul 2016 00:44:32 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01:f985:3c4b:2a0c:8bea? (2001-44b8-31ae-7b01-f985-3c4b-2a0c-8bea.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01:f985:3c4b:2a0c:8bea]) by smtp.gmail.com with ESMTPSA id 9sm2321535pfo.74.2016.07.20.00.44.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jul 2016 00:44:31 -0700 (PDT) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r303043 - in head: share/man/man4 sys/dev/vt sys/dev/vt/hw/fb References: <201607191920.u6JJKm7R026421@repo.freebsd.org> To: "Conrad E. Meyer" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Kubilay Kocak Message-ID: <1c485351-51f3-99f1-b7da-0745030dd1e6@FreeBSD.org> Date: Wed, 20 Jul 2016 17:44:27 +1000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:47.0) Gecko/20100101 Thunderbird/47.0 MIME-Version: 1.0 In-Reply-To: <201607191920.u6JJKm7R026421@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2016 07:44:33 -0000 On 20/07/2016 5:20 AM, Conrad E. Meyer wrote: > Author: cem > Date: Tue Jul 19 19:20:47 2016 > New Revision: 303043 > URL: https://svnweb.freebsd.org/changeset/base/303043 > > Log: > Increase vt(4) framebuffer maximum size > > And rename "DEFAULT" constants to the more accurate "MAX." > > PR: 210382 > Submitted by: Felix > Reviewed by: wblock, cem > Tested by: Dave Cottlehuber Can MFC? There are high hopes for this coming out in 11.0 / next 10.x re is cc'd on the original bugzilla issue > Modified: > head/share/man/man4/vt.4 > head/sys/dev/vt/hw/fb/vt_fb.c > head/sys/dev/vt/vt.h > head/sys/dev/vt/vt_core.c > > Modified: head/share/man/man4/vt.4 > ============================================================================== > --- head/share/man/man4/vt.4 Tue Jul 19 19:19:03 2016 (r303042) > +++ head/share/man/man4/vt.4 Tue Jul 19 19:20:47 2016 (r303043) > @@ -24,7 +24,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd June 21, 2016 > +.Dd July 19, 2016 > .Dt "VIRTUAL TERMINALS" 4 > .Os > .Sh NAME > @@ -36,8 +36,8 @@ > .Cd "options VT_MAXWINDOWS=N" > .Cd "options VT_ALT_TO_ESC_HACK=1" > .Cd "options VT_TWOBUTTON_MOUSE" > -.Cd "options VT_FB_DEFAULT_WIDTH=X" > -.Cd "options VT_FB_DEFAULT_HEIGHT=Y" > +.Cd "options VT_FB_MAX_WIDTH=X" > +.Cd "options VT_FB_MAX_HEIGHT=Y" > .Cd "options SC_NO_CUTPASTE" > .Cd "device vt" > .Pp > > Modified: head/sys/dev/vt/hw/fb/vt_fb.c > ============================================================================== > --- head/sys/dev/vt/hw/fb/vt_fb.c Tue Jul 19 19:19:03 2016 (r303042) > +++ head/sys/dev/vt/hw/fb/vt_fb.c Tue Jul 19 19:20:47 2016 (r303043) > @@ -416,10 +416,10 @@ vt_fb_init(struct vt_device *vd) > int err; > > info = vd->vd_softc; > - vd->vd_height = MIN(VT_FB_DEFAULT_HEIGHT, info->fb_height); > + vd->vd_height = MIN(VT_FB_MAX_HEIGHT, info->fb_height); > margin = (info->fb_height - vd->vd_height) >> 1; > vd->vd_transpose = margin * info->fb_stride; > - vd->vd_width = MIN(VT_FB_DEFAULT_WIDTH, info->fb_width); > + vd->vd_width = MIN(VT_FB_MAX_WIDTH, info->fb_width); > margin = (info->fb_width - vd->vd_width) >> 1; > vd->vd_transpose += margin * (info->fb_bpp / NBBY); > vd->vd_video_dev = info->fb_video_dev; > > Modified: head/sys/dev/vt/vt.h > ============================================================================== > --- head/sys/dev/vt/vt.h Tue Jul 19 19:19:03 2016 (r303042) > +++ head/sys/dev/vt/vt.h Tue Jul 19 19:20:47 2016 (r303043) > @@ -377,11 +377,11 @@ void vt_upgrade(struct vt_device *vd); > #define PIXEL_WIDTH(w) ((w) / 8) > #define PIXEL_HEIGHT(h) ((h) / 16) > > -#ifndef VT_FB_DEFAULT_WIDTH > -#define VT_FB_DEFAULT_WIDTH 2048 > +#ifndef VT_FB_MAX_WIDTH > +#define VT_FB_MAX_WIDTH 4096 > #endif > -#ifndef VT_FB_DEFAULT_HEIGHT > -#define VT_FB_DEFAULT_HEIGHT 1200 > +#ifndef VT_FB_MAX_HEIGHT > +#define VT_FB_MAX_HEIGHT 2400 > #endif > > /* name argument is not used yet. */ > > Modified: head/sys/dev/vt/vt_core.c > ============================================================================== > --- head/sys/dev/vt/vt_core.c Tue Jul 19 19:19:03 2016 (r303042) > +++ head/sys/dev/vt/vt_core.c Tue Jul 19 19:20:47 2016 (r303043) > @@ -181,8 +181,8 @@ static void vt_resume_handler(void *priv > > SET_DECLARE(vt_drv_set, struct vt_driver); > > -#define _VTDEFH MAX(100, PIXEL_HEIGHT(VT_FB_DEFAULT_HEIGHT)) > -#define _VTDEFW MAX(200, PIXEL_WIDTH(VT_FB_DEFAULT_WIDTH)) > +#define _VTDEFH MAX(100, PIXEL_HEIGHT(VT_FB_MAX_HEIGHT)) > +#define _VTDEFW MAX(200, PIXEL_WIDTH(VT_FB_MAX_WIDTH)) > > struct terminal vt_consterm; > static struct vt_window vt_conswindow; > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >