 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeon_ttm.c,v 1.23 2021/12/19 12:23:58 riastradh Exp $	*/
+/*	$NetBSD: radeon_ttm.c,v 1.24 2021/12/23 17:09:25 hannken Exp $	*/
 /*
  * Copyright 2009 Jerome Glisse.
  * All Rights Reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
+ *
 @@ -23,27 +23,27 @@
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
+ *
  */
 /*
  * Authors:
  *    Jerome Glisse <glisse@freedesktop.org>
  *    Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
  *    Dave Airlie
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.23 2021/12/19 12:23:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.24 2021/12/23 17:09:25 hannken Exp $");
 #include <linux/dma-mapping.h>
 #include <linux/pagemap.h>
 #include <linux/pci.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/swap.h>
 #include <linux/swiotlb.h>
 #include <drm/drm_agpsupport.h>
 #include <drm/drm_debugfs.h>
 #include <drm/drm_device.h>
 #include <drm/drm_file.h>
 @@ -436,28 +436,28 @@ static int radeon_ttm_io_mem_reserve(str
 		return -EINVAL;
 	switch (mem->mem_type) {
 	case TTM_PL_SYSTEM:
 		/* system memory */
 		return 0;
 	case TTM_PL_TT:
 #if IS_ENABLED(CONFIG_AGP)
 		if (rdev->flags & RADEON_IS_AGP) {
 			/* RADEON_IS_AGP is set only if AGP is active */
 			mem->bus.offset = mem->start << PAGE_SHIFT;
 			mem->bus.base = rdev->mc.agp_base;
 			mem->bus.is_iomem = !rdev->ddev->agp->cant_use_aperture;
 			KASSERTMSG((mem->bus.base & (PAGE_SIZE - 1)) == 0,
-			    "agp aperture is not page-aligned: %lx",
+			    "agp aperture is not page-aligned: %" PRIx64 "",
-			    mem->bus.base);
+			    (uint64_t)mem->bus.base);
 			KASSERT((mem->bus.offset & (PAGE_SIZE - 1)) == 0);
+		}
 #endif
 		break;
 	case TTM_PL_VRAM:
 		mem->bus.offset = mem->start << PAGE_SHIFT;
 		/* check if it's visible */
 		if ((mem->bus.offset + mem->bus.size) > rdev->mc.visible_vram_size)
 			return -EINVAL;
 		mem->bus.base = rdev->mc.aper_base;
 		mem->bus.is_iomem = true;
 #ifdef __alpha__
 		/*
 @@ -475,28 +475,28 @@ static int radeon_ttm_io_mem_reserve(str
 		if (!mem->bus.addr)
 			return -ENOMEM;
 		/*
 		 * Alpha: Use just the bus offset plus
 		 * the hose/domain memory base for bus.base.
 		 * It then can be used to build PTEs for VRAM
 		 * access, as done in ttm_bo_vm_fault().
 		 */
 		mem->bus.base = (mem->bus.base & 0x0ffffffffUL) +
 			rdev->ddev->hose->dense_mem_base;
 #endif
 		KASSERTMSG((mem->bus.base & (PAGE_SIZE - 1)) == 0,
-		    "mc aperture is not page-aligned: %lx",
+		    "mc aperture is not page-aligned: %" PRIx64 "",
-		    mem->bus.base);
+		    (uint64_t)mem->bus.base);
 		KASSERT((mem->bus.offset & (PAGE_SIZE - 1)) == 0);
 		break;
 	default:
 		return -EINVAL;
+	}
 	return 0;
+}
 static void radeon_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
+{
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ttm_bo.c,v 1.29 2021/12/19 12:40:44 riastradh Exp $	*/
+/*	$NetBSD: ttm_bo.c,v 1.30 2021/12/23 17:09:25 hannken Exp $	*/
 /* SPDX-License-Identifier: GPL-2.0 OR MIT */
 /**************************************************************************
+ *
  * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
  * All Rights Reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
 @@ -22,27 +22,27 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
  * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
  **************************************************************************/
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.29 2021/12/19 12:40:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.30 2021/12/23 17:09:25 hannken Exp $");
 #define pr_fmt(fmt) "[TTM] " fmt
 #ifdef __NetBSD__
 #include <sys/types.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_object.h>
 #endif
 #include <drm/drm_prime.h>
 #include <drm/ttm/ttm_module.h>
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
 @@ -1828,28 +1828,28 @@ bool ttm_mem_reg_is_pci(struct ttm_bo_de
 		if (mem->placement & TTM_PL_FLAG_CACHED)
 			return false;
+	}
 	return true;
+}
 void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo)
+{
 #ifdef __NetBSD__
 	if (bo->mem.bus.is_iomem) {
 		paddr_t start, end, pa;
 		KASSERTMSG((bo->mem.bus.base & (PAGE_SIZE - 1)) == 0,
-		    "bo bus base addr not page-aligned: %lx",
+		    "bo bus base addr not page-aligned: %" PRIx64 "",
-		    bo->mem.bus.base);
+		    (uint64_t)bo->mem.bus.base);
 		KASSERTMSG((bo->mem.bus.offset & (PAGE_SIZE - 1)) == 0,
 		    "bo bus offset not page-aligned: %lx",
 		    bo->mem.bus.offset);
 		start = bo->mem.bus.base + bo->mem.bus.offset;
 		KASSERT((bo->mem.bus.size & (PAGE_SIZE - 1)) == 0);
 		end = start + bo->mem.bus.size;
 		for (pa = start; pa < end; pa += PAGE_SIZE)
 			pmap_pv_protect(pa, VM_PROT_NONE);
 	} else if (bo->ttm != NULL) {
 		unsigned i;
 		rw_enter(bo->uvmobj.vmobjlock, RW_WRITER);