From owner-p4-projects@FreeBSD.ORG  Fri Aug 26 21:44:16 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 8199616A421; Fri, 26 Aug 2005 21:44:16 +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 4038316A41F
	for <perforce@freebsd.org>; Fri, 26 Aug 2005 21:44:16 +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 0E52E43D49
	for <perforce@freebsd.org>; Fri, 26 Aug 2005 21:44:16 +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 j7QLiFUF087723
	for <perforce@freebsd.org>; Fri, 26 Aug 2005 21:44:15 GMT
	(envelope-from anholt@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7QLiFDC087720
	for perforce@freebsd.org; Fri, 26 Aug 2005 21:44:15 GMT
	(envelope-from anholt@freebsd.org)
Date: Fri, 26 Aug 2005 21:44:15 GMT
Message-Id: <200508262144.j7QLiFDC087720@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 82649 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 21:44:17 -0000

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

Change 82649 by anholt@anholt_leguin on 2005/08/26 21:43:54

	Remove FreeBSD local diffs now that resource allocation is fixed.

Affected files ...

.. //depot/projects/drm-merge/sys/dev/drm/radeon_cp.c#7 edit

Differences ...

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

@@ -35,7 +35,7 @@
 #include "dev/drm/radeon_drm.h"
 #include "dev/drm/radeon_drv.h"
 #include "dev/drm/r300_reg.h"
-#include "r300_reg.h"
+#include "dev/drm/r300_reg.h"
 
 #define RADEON_FIFO_DEBUG	0
 
@@ -1491,6 +1491,7 @@
 	dev_priv->depth_pitch_offset = (((dev_priv->depth_pitch / 64) << 22) |
 					((dev_priv->depth_offset
 					  + dev_priv->fb_location) >> 10));
+
 	dev_priv->gart_size = init->gart_size;
 	dev_priv->gart_vm_start = dev_priv->fb_location
 	    + RADEON_READ(RADEON_CONFIG_APER_SIZE);
@@ -2069,11 +2070,6 @@
 		break;
 	}
 
-	/* Disable initmaps because it is broken on FreeBSD, and results in
-	 * crashes on startup for some.  The proper fix will involve being
-	 * smarter about allocating PCI resources.
-	 */
-	/*
 	if (drm_device_is_agp(dev))
 		dev_priv->flags |= CHIP_IS_AGP;
 
@@ -2106,7 +2102,6 @@
 			 _DRM_WRITE_COMBINING, &map);
 	if (ret != 0)
 		return ret;
-	*/
 
 	return 0;
 }