 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_memory.c,v 1.1.2.3 2013/07/24 02:47:19 riastradh Exp $	*/
+/*	$NetBSD: drm_memory.c,v 1.1.2.4 2013/07/24 02:47:50 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.1.2.3 2013/07/24 02:47:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.1.2.4 2013/07/24 02:47:50 riastradh Exp $");
 /* XXX Cargo-culted from the old drm_memory.c.  */
 #ifdef _KERNEL_OPT
 #include "agp_i810.h"
 #include "genfb.h"
 #else
 #define	NAGP_I810	1	/* XXX WTF?  */
 #define	NGENFB		0	/* XXX WTF?  */
 #endif
 #include <sys/bus.h>
 @@ -230,31 +230,29 @@ drm_iounmap(struct drm_device *dev, stru
  * by ioctls with the drm global mutex held.
+ *
  * XXX Error information is lost because this returns NULL on failure,
  * not even an error embedded in a pointer.
  */
 struct drm_dma_handle *
 drm_pci_alloc(struct drm_device *dev, size_t size, size_t align)
+{
 	int nsegs;
 	int error;
 	/*
 	 * Allocate a drm_dma_handle record.
 	 * XXX Must use kzalloc because callers pass this to kfree, not
 	 * necessarily to drm_pci_free.  Whattakludge.
 	 */
-	struct drm_dma_handle *const dmah = kzalloc(sizeof(*dmah), GFP_ATOMIC);
+	struct drm_dma_handle *const dmah = kmem_alloc(sizeof(*dmah),
 	    KM_NOSLEEP);
 	if (dmah == NULL) {
 		error = -ENOMEM;
 		goto out;
+	}
 	dmah->dmah_tag = dev->dmat;
 	/*
 	 * Allocate the requested amount of DMA-safe memory.
 	 */
 	/* XXX errno NetBSD->Linux */
 	error = -bus_dmamem_alloc(dmah->dmah_tag, size, align, 0,
 	    &dmah->dmah_seg, 1, &nsegs, BUS_DMA_NOWAIT);
 	if (error)
 @@ -298,42 +296,32 @@ drm_pci_alloc(struct drm_device *dev, si
 	/* Record the bus address for convenient reference.  */
 	dmah->busaddr = dmah->dmah_map->dm_segs[0].ds_addr;
 	/* Zero the DMA buffer.  XXX Yikes!  Is this necessary?  */
 	memset(dmah->vaddr, 0, size);
 	/* Success!  */
 	return dmah;
 fail3:	bus_dmamap_destroy(dmah->dmah_tag, dmah->dmah_map);
 fail2:	bus_dmamem_unmap(dmah->dmah_tag, dmah->vaddr, dmah->size);
 fail1:	bus_dmamem_free(dmah->dmah_tag, &dmah->dmah_seg, 1);
 fail0:	dmah->dmah_tag = NULL;	/* XXX paranoia */
-	kfree(dmah);
+	kmem_free(dmah, sizeof(*dmah));
 out:	DRM_DEBUG("drm_pci_alloc failed: %d\n", error);
 	return NULL;
+}
 /*
- * Release the bus DMA mappings and memory in dmah.
+ * Release the bus DMA mappings and memory in dmah, and deallocate it.
  */
 void
-__drm_pci_free(struct drm_device *dev, struct drm_dma_handle *dmah)
+drm_pci_free(struct drm_device *dev, struct drm_dma_handle *dmah)
+{
 	bus_dmamap_unload(dmah->dmah_tag, dmah->dmah_map);
 	bus_dmamap_destroy(dmah->dmah_tag, dmah->dmah_map);
 	bus_dmamem_unmap(dmah->dmah_tag, dmah->vaddr, dmah->size);
 	bus_dmamem_free(dmah->dmah_tag, &dmah->dmah_seg, 1);
 	dmah->dmah_tag = NULL;	/* XXX paranoia */
 	kmem_free(dmah, sizeof(*dmah));
 /*
  * Release the bus DMA mappings and memory in dmah, and deallocate it.
  */
 void
 drm_pci_free(struct drm_device *dev, struct drm_dma_handle *dmah)
 	__drm_pci_free(dev, dmah);
 	kfree(dmah);
+}