From 3de8a0378fe9d46d02eec1b0054452fdcdee5327 Mon Sep 17 00:00:00 2001
From: anholt <anholt@FreeBSD.org>
Date: Mon, 28 Nov 2005 23:13:57 +0000
Subject: 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.

---
 sys/dev/drm/drm_pci.c | 105 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 90 insertions(+), 15 deletions(-)

(limited to 'sys/dev/drm/drm_pci.c')

diff --git a/sys/dev/drm/drm_pci.c b/sys/dev/drm/drm_pci.c
index 0569e93..0dca37b 100644
--- a/sys/dev/drm/drm_pci.c
+++ b/sys/dev/drm/drm_pci.c
@@ -26,44 +26,119 @@
  * AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dev/drm/drmP.h"
 
 /**********************************************************************/
 /** \name PCI memory */
 /*@{*/
 
+#if defined(__FreeBSD__)
+static void
+drm_pci_busdma_callback(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
+{
+	drm_dma_handle_t *dmah = arg;
+
+	if (error != 0)
+		return;
+
+	KASSERT(nsegs == 1, ("drm_pci_busdma_callback: bad dma segment count"));
+	dmah->busaddr = segs[0].ds_addr;
+}
+#endif
+
 /**
  * \brief Allocate a physically contiguous DMA-accessible consistent 
  * memory block.
  */
-void *
-drm_pci_alloc(drm_device_t *dev, size_t size, size_t align, dma_addr_t maxaddr,
-    dma_addr_t *busaddr)
+drm_dma_handle_t *
+drm_pci_alloc(drm_device_t *dev, size_t size, size_t align, dma_addr_t maxaddr)
 {
-	void *vaddr;
+	drm_dma_handle_t *dmah;
+	int ret;
+
+	/* Need power-of-two alignment, so fail the allocation if it isn't. */
+	if ((align & (align - 1)) != 0) {
+		DRM_ERROR("drm_pci_alloc with non-power-of-two alignment %d\n",
+		    (int)align);
+		return NULL;
+	}
 
-	vaddr = contigmalloc(size, M_DRM, M_NOWAIT, 0ul, maxaddr, align,
-	    0);
-	*busaddr = vtophys(vaddr);
-	
-	return vaddr;
+	dmah = malloc(sizeof(drm_dma_handle_t), M_DRM, M_ZERO | M_NOWAIT);
+	if (dmah == NULL)
+		return NULL;
+
+#ifdef __FreeBSD__
+	ret = bus_dma_tag_create(NULL, align, 0, /* tag, align, boundary */
+	    maxaddr, BUS_SPACE_MAXADDR, /* lowaddr, highaddr */
+	    NULL, NULL, /* filtfunc, filtfuncargs */
+	    size, 1, size, /* maxsize, nsegs, maxsegsize */
+	    BUS_DMA_ALLOCNOW, NULL, NULL, /* flags, lockfunc, lockfuncargs */
+	    &dmah->tag);
+	if (ret != 0) {
+		free(dmah, M_DRM);
+		return NULL;
+	}
+
+	ret = bus_dmamem_alloc(dmah->tag, &dmah->vaddr, BUS_DMA_NOWAIT,
+	    &dmah->map);
+	if (ret != 0) {
+		bus_dma_tag_destroy(dmah->tag);
+		free(dmah, M_DRM);
+		return NULL;
+	}
+
+	ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr, size,
+	    drm_pci_busdma_callback, dmah, 0);
+	if (ret != 0) {
+		bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
+		bus_dma_tag_destroy(dmah->tag);
+		free(dmah, M_DRM);
+		return NULL;
+	}
+#elif defined(__NetBSD__)
+	ret = bus_dmamem_alloc(dev->dma_tag, size, align, PAGE_SIZE,
+	    &dmah->seg, 1, &nsegs, BUS_DMA_NOWAIT);
+	if ((ret != 0) || (nsegs != 1)) {
+		free(dmah, M_DRM);
+		return NULL;
+	}
+
+	ret = bus_dmamem_map(dev->dma_tag, &dmah->seg, 1, size, &dmah->addr,
+	    BUS_DMA_NOWAIT);
+	if (ret != 0) {
+		bus_dmamem_free(dev->dma_tag, &dmah->seg, 1);
+		free(dmah, M_DRM);
+		return NULL;
+	}
+
+	dmah->dmaaddr = h->seg.ds_addr;
+#endif
+
+	return dmah;
 }
 
 /**
  * \brief Free a DMA-accessible consistent memory block.
  */
 void
-drm_pci_free(drm_device_t *dev, size_t size, void *vaddr, dma_addr_t busaddr)
+drm_pci_free(drm_device_t *dev, drm_dma_handle_t *dmah)
 {
-#if __FreeBSD_version > 500000
-	if (vaddr == NULL)
+	if (dmah == NULL)
 		return;
-	contigfree(vaddr, size, M_DRM);	/* Not available on 4.x */
+
+#if defined(__FreeBSD__)
+	bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
+	bus_dma_tag_destroy(dmah->tag);
+#elif defined(__NetBSD__)
+	bus_dmamem_free(dev->dma_tag, &dmah->seg, 1);
 #endif
+
+	free(dmah, M_DRM);
 }
 
 /*@}*/
-- 
cgit v1.1