 @@ -1,14 +1,14 @@
-/*	$NetBSD: agp_i810.c,v 1.122 2016/05/01 04:22:50 nonaka Exp $	*/
+/*	$NetBSD: agp_i810.c,v 1.123 2018/08/27 00:51:37 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.122 2016/05/01 04:22:50 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.123 2018/08/27 00:51:37 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.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>
 @@ -1480,27 +1480,34 @@ agp_i810_unbind_memory(struct agp_softc
 	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);
 		mem->am_offset = 0;
 		break;
 	default:
 		panic("invalid agp i810 memory type: %d", mem->am_type);
+	}
 	mem->am_is_bound = 0;
 	return 0;
+}
 void
 agp_i810_reset(struct agp_i810_softc *isc)
+{
 	/* Restore the page table control register.  */
 	bus_space_write_4(isc->bst, isc->bsh, AGP_I810_PGTBL_CTL,
 	    isc->pgtblctl);
 	agp_flush_cache();
+}
 static bool
 agp_i810_resume(device_t dv, const pmf_qual_t *qual)
+{
 	struct agp_softc *sc = device_private(dv);
 	struct agp_i810_softc *isc = sc->as_chipc;
-	/*
+	agp_i810_reset(isc);
 	 * XXX Nothing uses this!  Save on suspend, restore on resume?
 	 */
 	isc->pgtblctl_resume_hack = READ4(AGP_I810_PGTBL_CTL);
 	agp_flush_cache();
 	return true;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: agp_i810var.h,v 1.6 2015/03/06 22:03:06 riastradh Exp $	*/
+/*	$NetBSD: agp_i810var.h,v 1.7 2018/08/27 00:51:37 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
 @@ -48,30 +48,28 @@ struct agp_i810_softc {
 	bus_space_tag_t gtt_bst;
 	bus_space_handle_t gtt_bsh;
 	bus_size_t gtt_size;
 	/* Chipset flush page.  */
 	bus_space_tag_t flush_bst;
 	bus_space_handle_t flush_bsh;
 	bus_addr_t flush_addr;
 	/* i810-only fields.  */
 	struct agp_gatt *gatt;		/* i810-only OS-allocated GTT */
 	uint32_t dcache_size;		/* i810-only on-chip memory size */
-	/* XXX Kludge to work around broken X servers.  */
+	/* Cached pgtblctl register for resume.  */
 	pcireg_t pgtblctl;
 	/* XXX Vestige of unfinished powerhook?  */
 	uint32_t pgtblctl_resume_hack;
 };
 extern struct agp_softc	*agp_i810_sc;
 #define	AGP_I810_GTT_VALID		0x01
 #define	AGP_I810_GTT_I810_DCACHE	0x02 /* i810-only */
 #define	AGP_I810_GTT_CACHED		0x06 /* >=i830 */
 int	agp_i810_write_gtt_entry(struct agp_i810_softc *, off_t, bus_addr_t,
 	    int);
 void	agp_i810_post_gtt_entry(struct agp_i810_softc *, off_t);
 void	agp_i810_chipset_flush(struct agp_i810_softc *);
 void	agp_i810_reset(struct agp_i810_softc *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_gtt.c,v 1.6 2018/08/06 00:30:15 riastradh Exp $	*/
+/*	$NetBSD: intel_gtt.c,v 1.7 2018/08/27 00:51:37 riastradh Exp $	*/
 /*-
  * Copyright (c) 2014 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.
 @@ -22,27 +22,27 @@
  * 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.
  */
 /* Intel GTT stubs */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.6 2018/08/06 00:30:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.7 2018/08/27 00:51:37 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <machine/vmparam.h>
 #include <dev/pci/pcivar.h>		/* XXX agpvar.h needs...  */
 #include <dev/pci/agpvar.h>
 #include <dev/pci/agp_i810var.h>
 #include "drm/intel-gtt.h"
 @@ -115,28 +115,34 @@ fail0:	KASSERT(error);
 void
 intel_gmch_remove(void)
+{
 	struct agp_softc *const sc = agp_i810_sc;
 	bus_dmamap_unload(sc->as_dmat, intel_gtt.scratch_map);
 	bus_dmamap_destroy(sc->as_dmat, intel_gtt.scratch_map);
 	bus_dmamem_free(sc->as_dmat, &intel_gtt.scratch_seg, 1);
+}
 bool
 intel_enable_gtt(void)
+{
 	struct agp_softc *sc = agp_i810_sc;
 	struct agp_i810_softc *isc;
-	return (agp_i810_sc != NULL);
+	if (sc == NULL)
 		return false;
 	isc = sc->as_chipc;
 	agp_i810_reset(isc);
 	return true;
+}
 void
 intel_gtt_chipset_flush(void)
+{
 	KASSERT(agp_i810_sc != NULL);
 	agp_i810_chipset_flush(agp_i810_sc->as_chipc);
+}
 void
 intel_gtt_insert_entries(bus_dmamap_t dmamap, unsigned va_page, unsigned flags)
+{