Cleanup of the d_mmap_t interface.

- Get rid of the useless atop() / pmap_phys_address() detour.  The
  device mmap handlers must now give back the physical address
  without atop()'ing it.
- Don't borrow the physical address of the mapping in the returned
  int.  Now we properly pass a vm_offset_t * and expect it to be
  filled by the mmap handler when the mapping was successful.  The
  mmap handler must now return 0 when successful, any other value
  is considered as an error.  Previously, returning -1 was the only
  way to fail.  This change thus accidentally fixes some devices
  which were bogusly returning errno constants which would have been
  considered as addresses by the device pager.
- Garbage collect the poorly named pmap_phys_address() now that it's
  no longer used.
- Convert all the d_mmap_t consumers to the new API.

I'm still not sure wheter we need a __FreeBSD_version bump for this,
since and we didn't guarantee API/ABI stability until 5.1-RELEASE.

Discussed with:		alc, phk, jake
Reviewed by:		peter
Compile-tested on:	LINT (i386), GENERIC (alpha and sparc64)
Runtime-tested on:	i386

1 files changed, 10 insertions, 6 deletions

diff --git a/sys/dev/drm/drm_vm.h b/sys/dev/drm/drm_vm.h
index 5fd9a39..705ca48 100644
--- a/sys/dev/drm/drm_vm.h
+++ b/sys/dev/drm/drm_vm.h
@@ -5,7 +5,8 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot)
+static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, vm_offset_t *paddr,
+    int prot)
 {
 	drm_device_t	 *dev	 = kdev->si_drv1;
 	drm_device_dma_t *dma	 = dev->dma;
@@ -19,10 +20,11 @@ static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot)
 	physical = dma->pagelist[page];
 
 	DRM_DEBUG("0x%08x (page %lu) => 0x%08lx\n", offset, page, physical);
-	return atop(physical);
+	*paddr = physical;
+	return 0;
 }
 
-int DRM(mmap)(dev_t kdev, vm_offset_t offset, int prot)
+int DRM(mmap)(dev_t kdev, vm_offset_t offset, vm_offset_t *paddr, int prot)
 {
 	drm_device_t	*dev	= kdev->si_drv1;
 	drm_map_t	*map	= NULL;
@@ -43,7 +45,7 @@ int DRM(mmap)(dev_t kdev, vm_offset_t offset, int prot)
 	if (dev->dma
 	    && offset >= 0
 	    && offset < ptoa(dev->dma->page_count))
-		return DRM(dma_mmap)(kdev, offset, prot);
+		return DRM(dma_mmap)(kdev, offset, paddr, prot);
 
 				/* A sequential search of a linked list is
 				   fine here because: 1) there will only be
@@ -72,9 +74,11 @@ int DRM(mmap)(dev_t kdev, vm_offset_t offset, int prot)
 	case _DRM_FRAME_BUFFER:
 	case _DRM_REGISTERS:
 	case _DRM_AGP:
-		return atop(offset);
+		*paddr = offset;
+		return 0;
 	case _DRM_SHM:
-		return atop(vtophys(offset));
+		*paddr = vtophys(offset);
+		return 0;
 	default:
 		return -1;	/* This should never happen. */
 	}