From owner-svn-src-all@FreeBSD.ORG  Sun Nov  2 14:08:54 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D6165B8B;
 Sun,  2 Nov 2014 14:08:54 +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 C2B4098D;
 Sun,  2 Nov 2014 14:08:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA2E8sps029901;
 Sun, 2 Nov 2014 14:08:54 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA2E8sM2029900;
 Sun, 2 Nov 2014 14:08:54 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201411021408.sA2E8sM2029900@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org
 using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 2 Nov 2014 14:08:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273969 - head/sys/dev/drm2/ttm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Nov 2014 14:08:54 -0000

Author: tijl
Date: Sun Nov  2 14:08:54 2014
New Revision: 273969
URL: https://svnweb.freebsd.org/changeset/base/273969

Log:
  Use default memory type for TTM buffer objects that may be cached.
  
  MFC after:	1 week

Modified:
  head/sys/dev/drm2/ttm/ttm_bo_util.c

Modified: head/sys/dev/drm2/ttm/ttm_bo_util.c
==============================================================================
--- head/sys/dev/drm2/ttm/ttm_bo_util.c	Sun Nov  2 13:43:04 2014	(r273968)
+++ head/sys/dev/drm2/ttm/ttm_bo_util.c	Sun Nov  2 14:08:54 2014	(r273969)
@@ -508,8 +508,7 @@ static int ttm_bo_kmap_ttm(struct ttm_bu
 		 * or to make the buffer object look contiguous.
 		 */
 		prot = (mem->placement & TTM_PL_FLAG_CACHED) ?
-			VM_MEMATTR_WRITE_COMBINING :
-			ttm_io_prot(mem->placement);
+			VM_MEMATTR_DEFAULT : ttm_io_prot(mem->placement);
 		map->bo_kmap_type = ttm_bo_map_vmap;
 		map->num_pages = num_pages;
 		map->virtual = (void *)kva_alloc(num_pages * PAGE_SIZE);