From owner-svn-src-head@FreeBSD.ORG  Fri Sep  5 18:11:40 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B84AFF4;
 Fri,  5 Sep 2014 18:11:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A114E1A00;
 Fri,  5 Sep 2014 18:11:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s85IBdBe050812;
 Fri, 5 Sep 2014 18:11:39 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s85IBdoH050811;
 Fri, 5 Sep 2014 18:11:39 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201409051811.s85IBdoH050811@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Fri, 5 Sep 2014 18:11:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271180 - head/sys/dev/vt/hw/vga
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Sep 2014 18:11:40 -0000

Author: dumbbell
Date: Fri Sep  5 18:11:39 2014
New Revision: 271180
URL: http://svnweb.freebsd.org/changeset/base/271180

Log:
  vt_vga: vd_setpixel_t and vd_drawrect_t are noop in text mode
  
  MFC after:	3 days

Modified:
  head/sys/dev/vt/hw/vga/vt_vga.c

Modified: head/sys/dev/vt/hw/vga/vt_vga.c
==============================================================================
--- head/sys/dev/vt/hw/vga/vt_vga.c	Fri Sep  5 18:11:36 2014	(r271179)
+++ head/sys/dev/vt/hw/vga/vt_vga.c	Fri Sep  5 18:11:39 2014	(r271180)
@@ -352,6 +352,9 @@ static void
 vga_setpixel(struct vt_device *vd, int x, int y, term_color_t color)
 {
 
+	if (vd->vd_flags & VDF_TEXTMODE)
+		return;
+
 	vga_bitblt_put(vd, (y * VT_VGA_WIDTH / 8) + (x / 8), color,
 	    0x80 >> (x % 8));
 }
@@ -362,6 +365,9 @@ vga_drawrect(struct vt_device *vd, int x
 {
 	int x, y;
 
+	if (vd->vd_flags & VDF_TEXTMODE)
+		return;
+
 	for (y = y1; y <= y2; y++) {
 		if (fill || (y == y1) || (y == y2)) {
 			for (x = x1; x <= x2; x++)