Update DRM to CVS snapshot as of 2005-11-28. Notable changes:

- S3 Savage driver ported.
- Added support for ATI_fragment_shader registers for r200.
- Improved r300 support, needed for latest r300 DRI driver.
- (possibly) r300 PCIE support, needs X.Org server from CVS.
- Added support for PCI Matrox cards.
- Software fallbacks fixed for Rage 128, which used to render badly or hang.
- Some issues reported by WITNESS are fixed.
- i915 module Makefile added, as the driver may now be working, but is untested.
- Added scripts for copying and preprocessing DRM CVS for inclusion in the
  kernel.  Thanks to Daniel Stone for getting me started on that.

1 files changed, 50 insertions, 0 deletions

diff --git a/sys/dev/drm/drm-subprocess.pl b/sys/dev/drm/drm-subprocess.pl
new file mode 100644
index 0000000..d053c59
--- /dev/null
+++ b/sys/dev/drm/drm-subprocess.pl
@@ -0,0 +1,50 @@
+# $FreeBSD$
+#
+# Props to Daniel Stone for starting this script for me.  I hate perl.
+
+my $lastline = "";
+my $foundopening = 0;
+my $foundclosing = 0;
+
+while (<>) {
+	$curline = $_;
+	if (!$foundopening) {
+		if (/Copyright/) {
+			$foundopening = 1;
+			# print the previous line we buffered, but with /*-
+			if ($lastline !~ /\/\*-/) {
+				$lastline =~ s/\/\*/\/\*-/;
+			}
+			print $lastline;
+			# now, print the current line.
+			print $curline;
+		} else {
+			# print the previous line and continue on
+			print $lastline;
+		}
+	} elsif ($foundopening && !$foundclosing && /\*\//) {
+		# print the $FreeBSD$ bits after the end of the license block
+		$foundclosing = 1;
+		print;
+		print "\n";
+		print "#include <sys/cdefs.h>\n";
+		print "__FBSDID(\"\$FreeBSD\$\");\n";
+	} elsif ($foundopening) {
+		# Replace headers with the system's paths.  the headers we're
+		# concerned with are drm*.h, *_drm.h and *_drv.h
+		# 
+		s/#include "(.*)_drv.h/#include "dev\/drm\/\1_drv.h/;
+		s/#include "(.*)_drm.h/#include "dev\/drm\/\1_drm.h/;
+		s/#include "mga_ucode.h/#include "dev\/drm\/mga_ucode.h/;
+		s/#include "r300_reg.h/#include "dev\/drm\/r300_reg.h/;
+		s/#include "sis_ds.h/#include "dev\/drm\/sis_ds.h/;
+		s/#include "drm/#include "dev\/drm\/drm/;
+		print;
+	}
+	$lastline = $curline;
+}
+
+# if we never found the copyright header, then we're still a line behind.
+if (!$foundopening) {
+	print $lastline;
+}
\ No newline at end of file