 @@ -1,14 +1,14 @@
-/*	$NetBSD: agp_i810.c,v 1.91 2014/06/11 16:58:29 riastradh Exp $	*/
+/*	$NetBSD: agp_i810.c,v 1.92 2014/06/11 17:01:31 riastradh Exp $	*/
 /*-
  * Copyright (c) 2000 Doug Rabson
  * Copyright (c) 2000 Ruslan Ermilov
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -20,27 +20,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
+ *
  *	$FreeBSD$
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.91 2014/06/11 16:58:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.92 2014/06/11 17:01:31 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/xcall.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 @@ -1232,46 +1232,46 @@ agp_i810_bind_memory(struct agp_softc *s
 	 * to the GTT through the MMIO window.
 	 * Until the issue is solved, simply restore it.
 	 */
 	pgtblctl = bus_space_read_4(isc->bst, isc->bsh, AGP_I810_PGTBL_CTL);
 	if (pgtblctl != isc->pgtblctl) {
 		printf("agp_i810_bind_memory: PGTBL_CTL is 0x%"PRIx32
 		    " - fixing\n", pgtblctl);
 		bus_space_write_4(isc->bst, isc->bsh, AGP_I810_PGTBL_CTL,
 		    isc->pgtblctl);
+	}
 	switch (mem->am_type) {
 	case AGP_I810_MEMTYPE_MAIN:
-		error = agp_generic_bind_memory(sc, mem, offset);
+		error = agp_i810_bind_memory_main(sc, mem, offset);
 		break;
 	case AGP_I810_MEMTYPE_DCACHE:
 		error = agp_i810_bind_memory_dcache(sc, mem, offset);
 		break;
 	case AGP_I810_MEMTYPE_HWCURSOR:
 		error = agp_i810_bind_memory_hwcursor(sc, mem, offset);
 		break;
 	default:
 		panic("invalid agp i810 memory type: %d", mem->am_type);
+	}
 	if (error)
 		return error;
 	/* Success!  */
 	mem->am_is_bound = 1;
 	return 0;
+}
-static int __unused
+static int
 agp_i810_bind_memory_main(struct agp_softc *sc, struct agp_memory *mem,
     off_t offset)
+{
 	struct agp_i810_softc *const isc = sc->as_chipc;
 	bus_dma_segment_t *segs;
 	int nseg_alloc, nseg;
 	uint32_t i, j;
 	unsigned seg;
 	bus_addr_t addr;
 	bus_size_t len;
 	int error;
 	/* Ensure we have a sane size/offset that will fit.  */
 @@ -1284,27 +1284,27 @@ agp_i810_bind_memory_main(struct agp_sof
 	if (offset > (((isc->gtt_size/4) << AGP_PAGE_SHIFT) -
 		mem->am_size))
 		return EINVAL;
 	/* Allocate an array of DMA segments.  */
 	nseg_alloc = (mem->am_size >> AGP_PAGE_SHIFT);
 	if (nseg_alloc > (SIZE_MAX / sizeof(*segs))) {
 		error = ENOMEM;
 		goto fail0;
+	}
 	segs = malloc(nseg_alloc * sizeof(*segs), M_AGP, M_WAITOK);
 	/* Allocate DMA-safe physical segments.  */
-	error = bus_dmamem_alloc(sc->as_dmat, mem->am_size, AGP_PAGE_SIZE,
+	error = bus_dmamem_alloc(sc->as_dmat, mem->am_size, PAGE_SIZE,
 , segs, nseg_alloc, &nseg, BUS_DMA_WAITOK);
 	if (error)
 		goto fail1;
 	KASSERT(nseg <= nseg_alloc);
 	/* Shrink the array of DMA segments if we can.  */
 	if (nseg < nseg_alloc) {
 		segs = realloc(segs, nseg, M_AGP, M_WAITOK);
 		nseg_alloc = nseg;
+	}
 	/* Load the DMA map.  */
 	error = bus_dmamap_load_raw(sc->as_dmat, mem->am_dmamap,
 @@ -1404,27 +1404,27 @@ fail0:	for (j = 0; j < i; j += AGP_PAGE_
 static int
 agp_i810_unbind_memory(struct agp_softc *sc, struct agp_memory *mem)
+{
 	struct agp_i810_softc *isc = sc->as_chipc;
 	u_int32_t i;
 	if (!mem->am_is_bound)
 		return EINVAL;
 	switch (mem->am_type) {
 	case AGP_I810_MEMTYPE_MAIN:
 	case AGP_I810_MEMTYPE_HWCURSOR:
 		for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE)
-			(void)agp_i810_unbind_page(sc, mem->am_offset + i);
+			agp_i810_unbind_page(sc, mem->am_offset + i);
 		break;
 	case AGP_I810_MEMTYPE_DCACHE:
 		KASSERT(isc->chiptype == CHIP_I810);
 		for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE)
 			(void)agp_i810_write_gtt_entry(isc, i, 0);
 		break;
 	default:
 		panic("invalid agp i810 memory type: %d", mem->am_type);
+	}
 	mem->am_is_bound = 0;
 	return 0;
+}