 @@ -1,23 +1,23 @@
-/*	$NetBSD: i915_gem_mman.c,v 1.8 2021/12/19 11:56:52 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_mman.c,v 1.9 2021/12/19 11:57:42 riastradh Exp $	*/
 /*
  * SPDX-License-Identifier: MIT
+ *
  * Copyright © 2014-2016 Intel Corporation
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.8 2021/12/19 11:56:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.9 2021/12/19 11:57:42 riastradh Exp $");
 #include <linux/anon_inodes.h>
 #include <linux/mman.h>
 #include <linux/pfn_t.h>
 #include <linux/sizes.h>
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_requests.h"
 #include "i915_drv.h"
 #include "i915_gem_gtt.h"
 #include "i915_gem_ioctls.h"
 #include "i915_gem_object.h"
 @@ -229,36 +229,42 @@ compute_partial_view(const struct drm_i9
 	view.partial.offset = rounddown(page_offset, chunk);
 	view.partial.size =
 		min_t(unsigned int, chunk,
 		      (obj->base.size >> PAGE_SHIFT) - view.partial.offset);
 	/* If the partial covers the entire object, just create a normal VMA. */
 	if (chunk >= obj->base.size >> PAGE_SHIFT)
 		view.type = I915_GGTT_VIEW_NORMAL;
 	return view;
+}
 #ifdef __NetBSD__
 /*
  * XXX pmap_enter_default instead of pmap_enter because of a problem
  * with using weak aliases in kernel modules.
+ *
  * XXX This probably won't work in a Xen kernel!  Maybe this should be
  * #ifdef _MODULE?
  */
 int	pmap_enter_default(pmap_t, vaddr_t, paddr_t, vm_prot_t, unsigned);
 #define	pmap_enter	pmap_enter_default
 static int
-i915_gem_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, struct vm_page **pps,
+i915_error_to_vmf_fault(int err)
     int npages, int centeridx, vm_prot_t access_type, int flags)
+{
-	panic("NYI");
+	return err;
+}
 #else
 static vm_fault_t i915_error_to_vmf_fault(int err)
+{
 	switch (err) {
 	default:
 		WARN_ONCE(err, "unhandled error in %s: %i\n", __func__, err);
 		/* fallthrough */
 	case -EIO: /* shmemfs failure from swap device */
 	case -EFAULT: /* purged object */
 	case -ENODEV: /* bad object, how did you get here! */
 	case -ENXIO: /* unable to access backing store (on device) */
 		return VM_FAULT_SIGBUS;
 	case -ENOSPC: /* shmemfs allocation failure */
 @@ -267,89 +273,154 @@ static vm_fault_t i915_error_to_vmf_faul
 	case 0:
 	case -EAGAIN:
 	case -ERESTARTSYS:
 	case -EINTR:
 	case -EBUSY:
 		/*
 		 * EBUSY is ok: this just means that another thread
 		 * already did the job.
 		 */
 		return VM_FAULT_NOPAGE;
+	}
+}
 #endif
 #ifdef __NetBSD__
 static int
 vm_fault_cpu(struct uvm_faultinfo *ufi, struct i915_mmap_offset *mmo,
     vaddr_t vaddr, struct vm_page **pps, int npages, int centeridx, int flags)
 #else
 static vm_fault_t vm_fault_cpu(struct vm_fault *vmf)
 #endif
+{
 #ifndef __NetBSD__
 	struct vm_area_struct *area = vmf->vma;
 	struct i915_mmap_offset *mmo = area->vm_private_data;
 #endif
 	struct drm_i915_gem_object *obj = mmo->obj;
 #ifdef __NetBSD__
 	bool write = ufi->entry->protection & VM_PROT_WRITE;
 #else
 	bool write = area->vm_flags & VM_WRITE;
 #endif
 	resource_size_t iomap;
 	int err;
 	/* Sanity check that we allow writing into this object */
-	if (unlikely(i915_gem_object_is_readonly(obj) &&
+	if (unlikely(i915_gem_object_is_readonly(obj) && write))
-		     area->vm_flags & VM_WRITE))
+#ifdef __NetBSD__
 		return -EFAULT;
 #else
 		return VM_FAULT_SIGBUS;
 #endif
 	err = i915_gem_object_pin_pages(obj);
 	if (err)
 		goto out;
 	iomap = -1;
 	if (!i915_gem_object_type_has(obj, I915_GEM_OBJECT_HAS_STRUCT_PAGE)) {
 		iomap = obj->mm.region->iomap.base;
 		iomap -= obj->mm.region->region.start;
+	}
 	/* PTEs are revoked in obj->ops->put_pages() */
 #ifdef __NetBSD__
 	/* XXX No lmem supported yet.  */
 	KASSERT(i915_gem_object_type_has(obj,
 		I915_GEM_OBJECT_HAS_STRUCT_PAGE));
 	struct scatterlist *sg = obj->mm.pages->sgl;
 	unsigned startpage = (ufi->entry->offset + (vaddr - ufi->entry->start))
 	    >> PAGE_SHIFT;
 	paddr_t paddr;
 	int i;
 	for (i = 0; i < npages; i++) {
 		if ((flags & PGO_ALLPAGES) == 0 && i != centeridx)
 			continue;
 		if (pps[i] == PGO_DONTCARE)
 			continue;
 		paddr = page_to_phys(sg->sg_pgs[startpage + i]);
 		/* XXX errno NetBSD->Linux */
 		err = -pmap_enter(ufi->orig_map->pmap,
 		    vaddr + i*PAGE_SIZE, paddr, ufi->entry->protection,
 		    PMAP_CANFAIL | ufi->entry->protection);
 		if (err)
 			break;
+	}
 	pmap_update(ufi->orig_map->pmap);
 #else
 	err = remap_io_sg(area,
 			  area->vm_start, area->vm_end - area->vm_start,
 			  obj->mm.pages->sgl, iomap);
 #endif
-	if (area->vm_flags & VM_WRITE) {
+	if (write) {
 		GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
 		obj->mm.dirty = true;
+	}
 	i915_gem_object_unpin_pages(obj);
 out:
 	return i915_error_to_vmf_fault(err);
+}
 #ifdef __NetBSD__
 static int
 vm_fault_gtt(struct uvm_faultinfo *ufi, struct i915_mmap_offset *mmo,
     vaddr_t vaddr, struct vm_page **pps, int npages, int centeridx, int flags)
 #else
 static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
 #endif
+{
 #define MIN_CHUNK_PAGES (SZ_1M >> PAGE_SHIFT)
 #ifndef __NetBSD__
 	struct vm_area_struct *area = vmf->vma;
 	struct i915_mmap_offset *mmo = area->vm_private_data;
 #endif
 	struct drm_i915_gem_object *obj = mmo->obj;
 	struct drm_device *dev = obj->base.dev;
 	struct drm_i915_private *i915 = to_i915(dev);
 	struct intel_runtime_pm *rpm = &i915->runtime_pm;
 	struct i915_ggtt *ggtt = &i915->ggtt;
 #ifdef __NetBSD__
 	bool write = ufi->entry->protection & VM_PROT_WRITE;
 #else
 	bool write = area->vm_flags & VM_WRITE;
 #endif
 	intel_wakeref_t wakeref;
 	struct i915_vma *vma;
 	pgoff_t page_offset;
 	int srcu;
 	int ret;
 	/* Sanity check that we allow writing into this object */
 	if (i915_gem_object_is_readonly(obj) && write)
 #ifdef __NetBSD__
 		return -EFAULT;
 #else
 		return VM_FAULT_SIGBUS;
 #endif
 #ifdef __NetBSD__
 	page_offset = (ufi->entry->offset + (vaddr - ufi->entry->start))
 	    >> PAGE_SHIFT;
 #else
 	/* We don't use vmf->pgoff since that has the fake offset */
 	page_offset = (vmf->address - area->vm_start) >> PAGE_SHIFT;
 #endif
 	trace_i915_gem_object_fault(obj, page_offset, true, write);
 	ret = i915_gem_object_pin_pages(obj);
 	if (ret)
 		goto err;
 	wakeref = intel_runtime_pm_get(rpm);
 	ret = intel_gt_reset_trylock(ggtt->vm.gt, &srcu);
 	if (ret)
 		goto err_rpm;
 @@ -389,31 +460,53 @@ static vm_fault_t vm_fault_gtt(struct vm
+	}
 	/* Access to snoopable pages through the GTT is incoherent. */
 	if (obj->cache_level != I915_CACHE_NONE && !HAS_LLC(i915)) {
 		ret = -EFAULT;
 		goto err_unpin;
+	}
 	ret = i915_vma_pin_fence(vma);
 	if (ret)
 		goto err_unpin;
 	/* Finally, remap it using the new GTT offset */
 #ifdef __NetBSD__
 	unsigned startpage = page_offset;
 	paddr_t paddr;
 	int i;
 	for (i = 0; i < npages; i++) {
 		if ((flags & PGO_ALLPAGES) == 0 && i != centeridx)
 			continue;
 		if (pps[i] == PGO_DONTCARE)
 			continue;
 		paddr = ggtt->gmadr.start + vma->node.start
 		    + (startpage + i)*PAGE_SIZE;
 		/* XXX errno NetBSD->Linux */
 		ret = -pmap_enter(ufi->orig_map->pmap,
 		    vaddr + i*PAGE_SIZE, paddr, ufi->entry->protection,
 		    PMAP_CANFAIL | ufi->entry->protection);
 		if (ret)
 			break;
+	}
 	pmap_update(ufi->orig_map->pmap);
 #else
 	ret = remap_io_mapping(area,
 			       area->vm_start + (vma->ggtt_view.partial.offset << PAGE_SHIFT),
 			       (ggtt->gmadr.start + vma->node.start) >> PAGE_SHIFT,
 			       min_t(u64, vma->size, area->vm_end - area->vm_start),
 			       &ggtt->iomap);
 #endif
 	if (ret)
 		goto err_fence;
 	assert_rpm_wakelock_held(rpm);
 	/* Mark as being mmapped into userspace for later revocation */
 	mutex_lock(&i915->ggtt.vm.mutex);
 	if (!i915_vma_set_userfault(vma) && !obj->userfault_count++)
 		list_add(&obj->userfault_link, &i915->ggtt.userfault_list);
 	mutex_unlock(&i915->ggtt.vm.mutex);
 	/* Track the mmo associated with the fenced vma */
 	vma->mmo = mmo;
 @@ -431,27 +524,114 @@ static vm_fault_t vm_fault_gtt(struct vm
 err_fence:
 	i915_vma_unpin_fence(vma);
 err_unpin:
 	__i915_vma_unpin(vma);
 err_reset:
 	intel_gt_reset_unlock(ggtt->vm.gt, srcu);
 err_rpm:
 	intel_runtime_pm_put(rpm, wakeref);
 	i915_gem_object_unpin_pages(obj);
 err:
 	return i915_error_to_vmf_fault(ret);
+}
-#endif	/* __NetBSD__ */
+#ifdef __NetBSD__
 static int
 i915_gem_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, struct vm_page **pps,
     int npages, int centeridx, vm_prot_t access_type, int flags)
+{
 	struct uvm_object *uobj = ufi->entry->object.uvm_obj;
 	struct drm_gem_object *gem =
 	    container_of(uobj, struct drm_gem_object, gemo_uvmobj);
 	struct drm_i915_gem_object *obj = to_intel_bo(gem);
 	struct drm_device *dev = obj->base.dev;
 	struct drm_vma_offset_node *node;
 	struct i915_mmap_offset *mmo;
 	bool pinned = false;
 	int error;
 	KASSERT(rw_lock_held(obj->base.filp->vmobjlock));
 	KASSERT(!i915_gem_object_is_readonly(obj) ||
 	    (access_type & VM_PROT_WRITE) == 0);
 	KASSERT(i915_gem_object_type_has(obj,
 		I915_GEM_OBJECT_HAS_STRUCT_PAGE|I915_GEM_OBJECT_HAS_IOMEM));
 	/* Actually we don't support iomem right now!  */
 	KASSERT(i915_gem_object_type_has(obj,
 		I915_GEM_OBJECT_HAS_STRUCT_PAGE));
 	/*
 	 * Look up the mmo again because we can't conveniently store it
 	 * alongside the mapping unless we create a separate uvm object
 	 * for it.  XXX Consider creating a separate uvm object as a
 	 * kind of subobject of the main object.
 	 */
 	rcu_read_lock();
 	drm_vma_offset_lock_lookup(dev->vma_offset_manager);
 	node = drm_vma_offset_exact_lookup_locked(dev->vma_offset_manager,
 	    ufi->entry->start >> PAGE_SHIFT,
 	    (ufi->entry->end - ufi->entry->start) >> PAGE_SHIFT);
 	drm_vma_offset_unlock_lookup(dev->vma_offset_manager);
 	rcu_read_unlock();
 	/*
 	 * The mmo had better be there -- hope we can't remove the mmo
 	 * without unmapping first!
 	 */
 	KASSERT(node);
 	mmo = container_of(node, struct i915_mmap_offset, vma_node);
 	KASSERT(obj == mmo->obj);
 	/* XXX errno Linux->NetBSD */
 	error = -i915_gem_object_pin_pages(obj);
 	if (error)
 		goto out;
 	pinned = true;
 	switch (mmo->mmap_type) {
 	case I915_MMAP_TYPE_WC:
 	case I915_MMAP_TYPE_WB:
 	case I915_MMAP_TYPE_UC:
 		/* XXX errno Linux->NetBSD */
 		error = -vm_fault_cpu(ufi, mmo, vaddr, pps, npages, centeridx,
 		    flags);
 		break;
 	case I915_MMAP_TYPE_GTT:
 		error = -vm_fault_gtt(ufi, mmo, vaddr, pps, npages, centeridx,
 		    flags);
 		break;
 	default:
 		panic("invalid i915 gem mmap offset type: %d",
 		    mmo->mmap_type);
+	}
 out:	if (pinned)
 		i915_gem_object_unpin_pages(obj);
 	uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
 	/*
 	 * Remap EINTR to success, so that we return to userland.
 	 * On the way out, we'll deliver the signal, and if the signal
 	 * is not fatal then the user code which faulted will most likely
 	 * fault again, and we'll come back here for another try.
 	 */
 	if (error == EINTR)
 		error = 0;
 	return error;
+}
 #endif
 void __i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj)
+{
 	struct i915_vma *vma;
 	GEM_BUG_ON(!obj->userfault_count);
 	for_each_ggtt_vma(vma, obj)
 		i915_vma_revoke_mmap(vma);
 	GEM_BUG_ON(obj->userfault_count);
+}

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.i915drmkms,v 1.83 2021/12/19 11:52:07 riastradh Exp $
+#	$NetBSD: files.i915drmkms,v 1.84 2021/12/19 11:57:42 riastradh Exp $
 version	20180827
 define	intelfbbus	{ }
 device	i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810, firmload
 attach	i915drmkms at pci
 device	intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
 attach	intelfb at intelfbbus
 # This code comes from the Linux kernel, which assumes signed
 # overflow is OK.
 makeoptions 	i915drmkms	"COPTS.i915drmkms"+="-fwrapv"
 @@ -25,26 +25,27 @@ makeoptions	i915drmkms	"CPPFLAGS.i915drm
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_ALPHA_SUPPORT=0"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_FBDEV=1"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_GVT=0"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG_MMIO=1" # XXX
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_FORCE_PROBE=0"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_SPIN_REQUEST=0"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_SW_FENCE_CHECK_DAG=1" # XXX expensive debug option?
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500" # milliseconds
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_STOP_TIMEOUT=100" # milliseconds
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_PREEMPT_TIMEOUT=640" # milliseconds
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_CAPTURE_ERROR=0"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_SELFTEST=0"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=0"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_PM=1"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_INTEL_MEI_HDCP=0"
 makeoptions	i915drmkms	"CWARNFLAGS.i915drmkms"+="-Wno-missing-field-initializers"
 makeoptions	i915drmkms	"CWARNFLAGS.i915drmkms"+="-Wno-pointer-arith"
 makeoptions	i915drmkms	"CWARNFLAGS.i915drmkms"+="-Wno-shadow"
 makeoptions 	i915drmkms 	"CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
 makeoptions 	i915drmkms 	"CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
 makeoptions 	i915drmkms 	"CWARNFLAGS.intel_sprite.c"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
 makeoptions 	i915drmkms 	"CWARNFLAGS.intel_ddi.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :} ${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}"

 @@ -1,14 +1,14 @@
-/*	$NetBSD: io-mapping.h,v 1.8 2021/12/19 11:39:56 riastradh Exp $	*/
+/*	$NetBSD: io-mapping.h,v 1.9 2021/12/19 11:57:43 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.
 @@ -32,27 +32,27 @@
 #ifndef _LINUX_IO_MAPPING_H_
 #define _LINUX_IO_MAPPING_H_
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/mman.h>
 #include <uvm/uvm_extern.h>
 struct io_mapping {
 	bus_space_tag_t		diom_bst;
-	bus_addr_t		diom_addr;
+	bus_addr_t		base; /* Linux API */
 	bus_size_t		size; /* Linux API */
 	vaddr_t			diom_va;
 	bool			diom_mapped;
 };
 static inline bool
 bus_space_io_mapping_init_wc(bus_space_tag_t bst, struct io_mapping *mapping,
     bus_addr_t addr, bus_size_t size)
+{
 	bus_size_t offset;
 	KASSERT(PAGE_SIZE <= size);
 	KASSERT(0 == (size & (PAGE_SIZE - 1)));
 @@ -65,27 +65,27 @@ bus_space_io_mapping_init_wc(bus_space_t
 	 * have PAT or if we later make this use direct map.
 	 */
 	/* Make sure the region is mappable.  */
 	for (offset = 0; offset < size; offset += PAGE_SIZE) {
 		if (bus_space_mmap(bst, addr, offset, PROT_READ|PROT_WRITE,
 			BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE)
 		    == (paddr_t)-1)
 			return false;
+	}
 	/* Initialize the mapping record.  */
 	mapping->diom_bst = bst;
-	mapping->diom_addr = addr;
+	mapping->base = addr;
 	mapping->size = size;
 	mapping->diom_mapped = false;
 	/* Allocate kva for one page.  */
 	mapping->diom_va = uvm_km_alloc(kernel_map, PAGE_SIZE, PAGE_SIZE,
 	    UVM_KMF_VAONLY | UVM_KMF_WAITVA);
 	KASSERT(mapping->diom_va != 0);
 	return true;
+}
 static inline void
 io_mapping_fini(struct io_mapping *mapping)
 @@ -123,27 +123,27 @@ io_mapping_free(struct io_mapping *mappi
 static inline void *
 io_mapping_map_wc(struct io_mapping *mapping, bus_addr_t offset,
     bus_size_t size)
+{
 	paddr_t cookie;
 	KASSERT(size == PAGE_SIZE);
 	KASSERT(0 == (offset & (PAGE_SIZE - 1)));
 	KASSERT(PAGE_SIZE <= mapping->size);
 	KASSERT(offset <= (mapping->size - PAGE_SIZE));
 	KASSERT(__type_fit(off_t, offset));
 	KASSERT(!mapping->diom_mapped);
-	cookie = bus_space_mmap(mapping->diom_bst, mapping->diom_addr, offset,
+	cookie = bus_space_mmap(mapping->diom_bst, mapping->base, offset,
 	    PROT_READ|PROT_WRITE,
 	    BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE);
 	KASSERT(cookie != (paddr_t)-1);
 	pmap_kenter_pa(mapping->diom_va, pmap_phys_address(cookie),
 	    PROT_READ|PROT_WRITE, pmap_mmap_flags(cookie));
 	pmap_update(pmap_kernel());
 	mapping->diom_mapped = true;
 	return (void *)mapping->diom_va;
+}
 static inline void