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, 29 insertions, 28 deletions

diff --git a/sys/dev/drm/i915_drv.c b/sys/dev/drm/i915_drv.c
index 126fff1..3a632d4 100644
--- a/sys/dev/drm/i915_drv.c
+++ b/sys/dev/drm/i915_drv.c
@@ -27,47 +27,48 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
-#include "i915_drv.h"
-#include "drm_pciids.h"
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/i915_drm.h"
+#include "dev/drm/i915_drv.h"
+#include "dev/drm/drm_pciids.h"
 
 /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */
 static drm_pci_id_list_t i915_pciidlist[] = {
 	i915_PCI_IDS
 };
 
-extern drm_ioctl_desc_t i915_ioctls[];
-extern int i915_max_ioctl;
-
 static void i915_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = 1;	/* No dev_priv */
-	dev->prerelease = i915_driver_prerelease;
-	dev->pretakedown = i915_driver_pretakedown;
-	dev->irq_preinstall = i915_driver_irq_preinstall;
-	dev->irq_postinstall = i915_driver_irq_postinstall;
-	dev->irq_uninstall = i915_driver_irq_uninstall;
-	dev->irq_handler = i915_driver_irq_handler;
+	dev->driver.buf_priv_size	= 1;	/* No dev_priv */
+	dev->driver.load		= i915_driver_load;
+	dev->driver.preclose		= i915_driver_preclose;
+	dev->driver.lastclose		= i915_driver_lastclose;
+	dev->driver.device_is_agp	= i915_driver_device_is_agp,
+	dev->driver.irq_preinstall	= i915_driver_irq_preinstall;
+	dev->driver.irq_postinstall	= i915_driver_irq_postinstall;
+	dev->driver.irq_uninstall	= i915_driver_irq_uninstall;
+	dev->driver.irq_handler		= i915_driver_irq_handler;
 
-	dev->driver_ioctls = i915_ioctls;
-	dev->max_driver_ioctl = i915_max_ioctl;
+	dev->driver.ioctls		= i915_ioctls;
+	dev->driver.max_ioctl		= i915_max_ioctl;
 
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
+	dev->driver.name		= DRIVER_NAME;
+	dev->driver.desc		= DRIVER_DESC;
+	dev->driver.date		= DRIVER_DATE;
+	dev->driver.major		= DRIVER_MAJOR;
+	dev->driver.minor		= DRIVER_MINOR;
+	dev->driver.patchlevel		= DRIVER_PATCHLEVEL;
 
-	dev->use_agp = 1;
-	dev->require_agp = 1;
-	dev->use_mtrr = 1;
-	dev->use_irq = 1;
+	dev->driver.use_agp		= 1;
+	dev->driver.require_agp		= 1;
+	dev->driver.use_mtrr		= 1;
+	dev->driver.use_irq		= 1;
 }
 
 #ifdef __FreeBSD__