PERFORCE change 82649 for review

[Eric Anholt]

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

Change 82649 by anholt at 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;
 }