 @@ -1,55 +1,110 @@
-/*	$NetBSD: i915_gem_internal.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_internal.c,v 1.3 2021/12/19 01:38:51 riastradh Exp $	*/
 /*
  * SPDX-License-Identifier: MIT
+ *
  * Copyright © 2014-2016 Intel Corporation
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_internal.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_internal.c,v 1.3 2021/12/19 01:38:51 riastradh Exp $");
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
 #include <linux/swiotlb.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_gem.h"
 #include "i915_gem_object.h"
 #include "i915_scatterlist.h"
 #include "i915_utils.h"
 #ifndef __NetBSD__
 #define QUIET (__GFP_NORETRY | __GFP_NOWARN)
 #define MAYFAIL (__GFP_RETRY_MAYFAIL | __GFP_NOWARN)
 static void internal_free_pages(struct sg_table *st)
+{
 	struct scatterlist *sg;
 	for (sg = st->sgl; sg; sg = __sg_next(sg)) {
 		if (sg_page(sg))
 			__free_pages(sg_page(sg), get_order(sg->length));
+	}
 	sg_free_table(st);
 	kfree(st);
+}
 #endif
 static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj)
+{
 	struct drm_i915_private *i915 = to_i915(obj->base.dev);
 #ifdef __NetBSD__
 	bus_dma_tag_t dmat = i915->drm.dmat;
 	bus_dmamap_t map;
 	size_t nsegs;
 	unsigned sizes, seg;
 	int ret;
 	KASSERT(obj->mm.segs == NULL);
 	nsegs = obj->mm.nsegs = obj->base.size/PAGE_SIZE;
 	if (nsegs > UINT_MAX || nsegs > SIZE_MAX/sizeof(obj->mm.segs[0]))
 		return -ENOMEM;
 	obj->mm.segs = kmem_alloc(nsegs * sizeof(obj->mm.segs[0]), KM_NOSLEEP);
 	if (obj->mm.segs == NULL)
 		return -ENOMEM;
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamem_alloc(dmat, obj->base.size, PAGE_SIZE, 0,
 	    obj->mm.segs, nsegs, &obj->mm.rsegs, BUS_DMA_NOWAIT);
 	if (ret)
 		goto out0;
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamap_create(dmat, obj->base.size, obj->mm.rsegs,
 	    obj->base.size, 0, BUS_DMA_NOWAIT, &map);
 	if (ret)
 		goto out1;
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamap_load_raw(dmat, map, obj->mm.segs, obj->mm.rsegs,
 	    obj->base.size, BUS_DMA_NOWAIT);
 	if (ret)
 		goto out2;
 	ret = i915_gem_gtt_prepare_pages(obj, map);
 	if (ret)
 		goto out3;
 	for (sizes = 0, seg = 0; seg < map->dm_nsegs; seg++)
 		sizes |= map->dm_segs[seg].ds_len;
 	obj->mm.madv = I915_MADV_DONTNEED;
 	__i915_gem_object_set_pages(obj, map, sizes);
 	return 0;
 out4:	__unused
 	i915_gem_gtt_finish_pages(obj, map);
 out3:	bus_dmamap_unload(dmat, obj->mm.pages);
 out2:	bus_dmamap_destroy(dmat, obj->mm.pages);
 out1:	bus_dmamem_free(dmat, obj->mm.segs, obj->mm.rsegs);
 out0:	kmem_free(obj->mm.segs, nsegs * sizeof(obj->mm.segs[0]));
 	return ret;
 #else
 	struct sg_table *st;
 	struct scatterlist *sg;
 	unsigned int sg_page_sizes;
 	unsigned int npages;
 	int max_order;
 	gfp_t gfp;
 	max_order = MAX_ORDER;
 #ifdef CONFIG_SWIOTLB
 	if (swiotlb_nr_tbl()) {
 		unsigned int max_segment;
 		max_segment = swiotlb_max_segment();
 @@ -122,33 +177,50 @@ create_st:
 		goto err;
+	}
 	__i915_gem_object_set_pages(obj, st, sg_page_sizes);
 	return 0;
 err:
 	sg_set_page(sg, NULL, 0, 0);
 	sg_mark_end(sg);
 	internal_free_pages(st);
 	return -ENOMEM;
 #endif
+}
 #ifdef __NetBSD__
 static void i915_gem_object_put_pages_internal(struct drm_i915_gem_object *obj,
                                               bus_dmamap_t pages)
 #else
 static void i915_gem_object_put_pages_internal(struct drm_i915_gem_object *obj,
 					       struct sg_table *pages)
 #endif
+{
 	i915_gem_gtt_finish_pages(obj, pages);
 #ifdef __NetBSD__
 	bus_dma_tag_t dmat = obj->base.dev->dmat;
 	bus_dmamap_unload(dmat, pages);
 	bus_dmamap_destroy(dmat, pages);
 	bus_dmamem_free(dmat, obj->mm.segs, obj->mm.rsegs);
 	obj->mm.rsegs = 0;
 	kmem_free(obj->mm.segs, obj->mm.nsegs * sizeof(obj->mm.segs[0]));
 	obj->mm.segs = NULL;
 	obj->mm.nsegs = 0;
 #else
 	internal_free_pages(pages);
 #endif
 	obj->mm.dirty = false;
+}
 static const struct drm_i915_gem_object_ops i915_gem_object_internal_ops = {
 	.flags = I915_GEM_OBJECT_HAS_STRUCT_PAGE |
 		 I915_GEM_OBJECT_IS_SHRINKABLE,
 	.get_pages = i915_gem_object_get_pages_internal,
 	.put_pages = i915_gem_object_put_pages_internal,
 };
 /**
  * i915_gem_object_create_internal: create an object with volatile pages

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_gem_object_types.h,v 1.2 2021/12/18 23:45:30 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_object_types.h,v 1.3 2021/12/19 01:38:51 riastradh Exp $	*/
 /*
  * SPDX-License-Identifier: MIT
+ *
  * Copyright © 2016 Intel Corporation
  */
 #ifndef __I915_GEM_OBJECT_TYPES_H__
 #define __I915_GEM_OBJECT_TYPES_H__
 #include <drm/drm_gem.h>
 #include <uapi/drm/i915_drm.h>
 @@ -198,27 +198,36 @@ struct drm_i915_gem_object {
 		 */
 		struct intel_memory_region *region;
 		/**
 		 * List of memory region blocks allocated for this object.
 		 */
 		struct list_head blocks;
 		/**
 		 * Element within memory_region->objects or region->purgeable
 		 * if the object is marked as DONTNEED. Access is protected by
 		 * region->obj_lock.
 		 */
 		struct list_head region_link;
 #ifdef __NetBSD__
 		struct pglist pageq;    /* wired pages of normal objects */
 		struct sg_table *sg;    /* drm prime objects */
 		bus_dma_segment_t *segs;/* internal objects */
 		unsigned nsegs;
 		int rsegs;
 		bus_dmamap_t pages;     /* expedient misnomer */
 #else
 		struct sg_table *pages;
 #endif
 		void *mapping;
 		struct i915_page_sizes {
 			/**
 			 * The sg mask of the pages sg_table. i.e the mask of
 			 * of the lengths for each sg entry.
 			 */
 			unsigned int phys;
 			/**
 			 * The gtt page sizes we are allowed to use given the
 			 * sg mask and the supported page sizes. This will
 			 * express the smallest unit we can use for the whole