From owner-svn-src-stable-10@freebsd.org  Thu Apr 27 12:15:17 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 3F3B0D50C90;
 Thu, 27 Apr 2017 12:15:17 +0000 (UTC) (envelope-from kib@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 mx1.freebsd.org (Postfix) with ESMTPS id 11144E8D;
 Thu, 27 Apr 2017 12:15:17 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3RCFGlX047755;
 Thu, 27 Apr 2017 12:15:16 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3RCFGHU047754;
 Thu, 27 Apr 2017 12:15:16 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201704271215.v3RCFGHU047754@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 27 Apr 2017 12:15:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r317501 - stable/10/sys/dev/fb
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Apr 2017 12:15:17 -0000

Author: kib
Date: Thu Apr 27 12:15:15 2017
New Revision: 317501
URL: https://svnweb.freebsd.org/changeset/base/317501

Log:
  MFC r317196:
  Write-combine framebuffer writes through user-space mappings, if possible.

Modified:
  stable/10/sys/dev/fb/vesa.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/fb/vesa.c
==============================================================================
--- stable/10/sys/dev/fb/vesa.c	Thu Apr 27 12:12:33 2017	(r317500)
+++ stable/10/sys/dev/fb/vesa.c	Thu Apr 27 12:15:15 2017	(r317501)
@@ -1636,6 +1636,9 @@ vesa_mmap(video_adapter_t *adp, vm_ooffs
 		if (offset > adp->va_window_size - PAGE_SIZE)
 			return (-1);
 		*paddr = adp->va_info.vi_buffer + offset;
+#ifdef VM_MEMATTR_WRITE_COMBINING
+		*memattr = VM_MEMATTR_WRITE_COMBINING;
+#endif
 		return (0);
 	}
 	return ((*prevvidsw->mmap)(adp, offset, paddr, prot, memattr));