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, 6 insertions, 7 deletions

diff --git a/sys/dev/drm/drm_dma.c b/sys/dev/drm/drm_dma.c
index 21073b6..a8661ca 100644
--- a/sys/dev/drm/drm_dma.c
+++ b/sys/dev/drm/drm_dma.c
@@ -29,9 +29,11 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dev/drm/drmP.h"
 
 int drm_dma_setup(drm_device_t *dev)
@@ -63,12 +65,9 @@ void drm_dma_takedown(drm_device_t *dev)
 				  dma->bufs[i].buf_count,
 				  dma->bufs[i].seg_count);
 			for (j = 0; j < dma->bufs[i].seg_count; j++) {
-				drm_pci_free(dev, dma->bufs[i].buf_size,
-				    (void *)dma->bufs[i].seglist[j],
-				    dma->bufs[i].seglist_bus[j]);
+				drm_pci_free(dev, dma->bufs[i].seglist[j]);
 			}
 			free(dma->bufs[i].seglist, M_DRM);
-			free(dma->bufs[i].seglist_bus, M_DRM);
 		}
 
 	   	if (dma->bufs[i].buf_count) {
@@ -125,8 +124,8 @@ int drm_dma(DRM_IOCTL_ARGS)
 {
 	DRM_DEVICE;
 
-	if (dev->dma_ioctl) {
-		return dev->dma_ioctl(kdev, cmd, data, flags, p, filp);
+	if (dev->driver.dma_ioctl) {
+		return dev->driver.dma_ioctl(kdev, cmd, data, flags, p, filp);
 	} else {
 		DRM_DEBUG("DMA ioctl on driver with no dma handler\n");
 		return EINVAL;