From owner-p4-projects@FreeBSD.ORG  Fri Aug 26 19:16:14 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D6A816A44E; Fri, 26 Aug 2005 19:16:14 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E9E8316A44C
	for <perforce@freebsd.org>; Fri, 26 Aug 2005 19:16:13 +0000 (GMT)
	(envelope-from anholt@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B8DBC43D46
	for <perforce@freebsd.org>; Fri, 26 Aug 2005 19:16:13 +0000 (GMT)
	(envelope-from anholt@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7QJGDpo075244
	for <perforce@freebsd.org>; Fri, 26 Aug 2005 19:16:13 GMT
	(envelope-from anholt@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7QJGDZ9075241
	for perforce@freebsd.org; Fri, 26 Aug 2005 19:16:13 GMT
	(envelope-from anholt@freebsd.org)
Date: Fri, 26 Aug 2005 19:16:13 GMT
Message-Id: <200508261916.j7QJGDZ9075241@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anholt@freebsd.org using -f
From: Eric Anholt <anholt@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 82642 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Aug 2005 19:16:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=82642

Change 82642 by anholt@anholt_leguin on 2005/08/26 19:15:46

	MF DRI vendor branch 2005-08-26.

Affected files ...

.. //depot/projects/drm-merge/sys/dev/drm/ati_pcigart.c#6 integrate
.. //depot/projects/drm-merge/sys/dev/drm/r300_cmdbuf.c#2 integrate
.. //depot/projects/drm-merge/sys/dev/drm/r300_reg.h#2 integrate

Differences ...

==== //depot/projects/drm-merge/sys/dev/drm/ati_pcigart.c#6 (text+ko) ====

@@ -66,7 +66,7 @@
 
 	bzero(pci_gart, ATI_PCIGART_TABLE_SIZE);
 
-	KASSERT(PAGE_SIZE >= ATI_PCIGART_PAGE_SIZE, "page size too small");
+	KASSERT(PAGE_SIZE >= ATI_PCIGART_PAGE_SIZE, ("page size too small"));
 
 	for ( i = 0 ; i < pages ; i++ ) {
 		page_base = (u32) dev->sg->busaddr[i];

==== //depot/projects/drm-merge/sys/dev/drm/r300_cmdbuf.c#2 (text+ko) ====


==== //depot/projects/drm-merge/sys/dev/drm/r300_reg.h#2 (text+ko) ====