Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:40:44 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c drm_print.c
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c i915_vma.h
intel_uncore.h
src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_engine.h
intel_engine_cs.c
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ci_dpm.c
radeon_si_dpm.c
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c
src/sys/external/bsd/drm2/dist/include/drm/ttm: ttm_bo_api.h
ttm_set_memory.h
Log Message:
drm: Switch sense of #if __linux__ conditionals to use __NetBSD__.
Keep it consistent with the rest of drm.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/dist/drm/drm_print.c
cvs rdiff -u -r1.45 -r1.46 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.h
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine.h
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_api.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_set_memory.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.21 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.22
--- src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.21 Sun Dec 19 11:09:47 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_ioctl.c,v 1.21 2021/12/19 11:09:47 riastradh Exp $ */
+/* $NetBSD: drm_ioctl.c,v 1.22 2021/12/19 12:40:43 riastradh Exp $ */
/*
* Created: Fri Jan 8 09:01:26 1999 by [email protected]
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.21 2021/12/19 11:09:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.22 2021/12/19 12:40:43 riastradh Exp $");
#include <linux/export.h>
#include <linux/nospec.h>
@@ -353,11 +353,12 @@ drm_setclientcap(struct drm_device *dev,
if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
return -EOPNOTSUPP;
/* The modesetting DDX has a totally broken idea of atomic. */
-#ifdef __linux__
- if (current->comm[0] == 'X' && req->value == 1) {
+#ifdef __NetBSD__
+ if (current->p_comm[0] == 'X' && req->value == 1)
#else
- if (current->p_comm[0] == 'X' && req->value == 1) {
+ if (current->comm[0] == 'X' && req->value == 1)
#endif
+ {
pr_info("broken atomic modeset userspace detected, disabling atomic\n");
return -EOPNOTSUPP;
}
Index: src/sys/external/bsd/drm2/dist/drm/drm_print.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.13 src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.13 Sun Dec 19 12:34:42 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_print.c Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_print.c,v 1.13 2021/12/19 12:34:42 riastradh Exp $ */
+/* $NetBSD: drm_print.c,v 1.14 2021/12/19 12:40:43 riastradh Exp $ */
/*
* Copyright (C) 2016 Red Hat
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.13 2021/12/19 12:34:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.14 2021/12/19 12:40:43 riastradh Exp $");
#ifndef __NetBSD__ /* XXX ??? */
#define DEBUG /* for pr_debug() */
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_print.c,
unsigned int __drm_debug;
EXPORT_SYMBOL(__drm_debug);
-#ifdef __linux__
+#ifndef __NetBSD__
MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n"
"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n"
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.45 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.46
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.45 Sun Dec 19 12:32:15 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.45 2021/12/19 12:32:15 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.46 2021/12/19 12:40:43 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.45 2021/12/19 12:32:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.46 2021/12/19 12:40:43 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -1237,7 +1237,7 @@ static int i915_driver_hw_probe(struct d
pci_set_master(pdev);
-#ifdef __linux__
+#ifndef __NetBSD__
/*
* We don't have a max segment size, so set it to the max so sg's
* debugging layer doesn't complain
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.h:1.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.h:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.h:1.8 Sun Dec 19 12:25:37 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.h Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_vma.h,v 1.8 2021/12/19 12:25:37 riastradh Exp $ */
+/* $NetBSD: i915_vma.h,v 1.9 2021/12/19 12:40:43 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -62,12 +62,12 @@ int __must_check i915_vma_move_to_active
struct i915_request *rq,
unsigned int flags);
-#ifdef __linux__
-#define __i915_vma_flags(v) ((unsigned long *)&(v)->flags.counter)
-#define __i915_vma_flags_const(v) ((const unsigned long *)&(v)->flags.counter)
-#else
+#ifdef __NetBSD__
#define __i915_vma_flags(v) ((unsigned long *)&(v)->flags)
#define __i915_vma_flags_const(v) ((const unsigned long *)&(v)->flags)
+#else
+#define __i915_vma_flags(v) ((unsigned long *)&(v)->flags.counter)
+#define __i915_vma_flags_const(v) ((const unsigned long *)&(v)->flags.counter)
#endif
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h:1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h:1.10 Sun Dec 19 12:36:50 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_uncore.h,v 1.10 2021/12/19 12:36:50 riastradh Exp $ */
+/* $NetBSD: intel_uncore.h,v 1.11 2021/12/19 12:40:43 riastradh Exp $ */
/*
* Copyright © 2017 Intel Corporation
@@ -280,33 +280,8 @@ intel_wait_for_register_fw(struct intel_
}
/* register access functions */
-#ifdef __linux__
-#define __raw_read(x__, s__) \
-static inline u##x__ __raw_uncore_read##x__(const struct intel_uncore *uncore, \
- i915_reg_t reg) \
-{ \
- return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \
-}
-
-#define __raw_write(x__, s__) \
-static inline void __raw_uncore_write##x__(const struct intel_uncore *uncore, \
- i915_reg_t reg, u##x__ val) \
-{ \
- write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \
-}
-__raw_read(8, b)
-__raw_read(16, w)
-__raw_read(32, l)
-__raw_read(64, q)
-
-__raw_write(8, b)
-__raw_write(16, w)
-__raw_write(32, l)
-__raw_write(64, q)
+#ifdef __NetBSD__
-#undef __raw_read
-#undef __raw_write
-#else
static inline uint8_t __raw_uncore_read8(const struct intel_uncore *uncore,
i915_reg_t reg) {
return bus_space_read_1(uncore->regs_bst, uncore->regs_bsh, i915_mmio_reg_offset(reg));
@@ -355,7 +330,36 @@ static inline void __raw_uncore_write64(
i915_mmio_reg_offset(reg) + 4, val >> 32);
#endif
}
-#endif
+
+#else /* !__NetBSD__ */
+
+#define __raw_read(x__, s__) \
+static inline u##x__ __raw_uncore_read##x__(const struct intel_uncore *uncore, \
+ i915_reg_t reg) \
+{ \
+ return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \
+}
+
+#define __raw_write(x__, s__) \
+static inline void __raw_uncore_write##x__(const struct intel_uncore *uncore, \
+ i915_reg_t reg, u##x__ val) \
+{ \
+ write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \
+}
+__raw_read(8, b)
+__raw_read(16, w)
+__raw_read(32, l)
+__raw_read(64, q)
+
+__raw_write(8, b)
+__raw_write(16, w)
+__raw_write(32, l)
+__raw_write(64, q)
+
+#undef __raw_read
+#undef __raw_write
+
+#endif /* __NetBSD__ */
#define __uncore_read(name__, x__, s__, trace__) \
static inline u##x__ intel_uncore_##name__(struct intel_uncore *uncore, \
Index: src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine.h:1.3 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine.h:1.3 Sun Dec 19 11:08:40 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine.h Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_engine.h,v 1.3 2021/12/19 11:08:40 riastradh Exp $ */
+/* $NetBSD: intel_engine.h,v 1.4 2021/12/19 12:40:43 riastradh Exp $ */
/* SPDX-License-Identifier: MIT */
#ifndef _INTEL_RINGBUFFER_H_
@@ -112,34 +112,34 @@ execlists_active(const struct intel_engi
return *READ_ONCE(execlists->active);
}
-#ifdef __linux__
-static inline void
+#ifdef __NetBSD__
+static inline int
execlists_active_lock_bh(struct intel_engine_execlists *execlists)
{
- local_bh_disable(); /* prevent local softirq and lock recursion */
+ int s = splsoftserial(); /* prevent local softirq and lock recursion */
tasklet_lock(&execlists->tasklet);
+ return s;
}
static inline void
-execlists_active_unlock_bh(struct intel_engine_execlists *execlists)
+execlists_active_unlock_bh(struct intel_engine_execlists *execlists, int s)
{
tasklet_unlock(&execlists->tasklet);
- local_bh_enable(); /* restore softirq, and kick ksoftirqd! */
+ splraise(s); /* restore softirq, and kick ksoftirqd! */
}
#else
-static inline int
+static inline void
execlists_active_lock_bh(struct intel_engine_execlists *execlists)
{
- int s = splsoftserial(); /* prevent local softirq and lock recursion */
+ local_bh_disable(); /* prevent local softirq and lock recursion */
tasklet_lock(&execlists->tasklet);
- return s;
}
static inline void
-execlists_active_unlock_bh(struct intel_engine_execlists *execlists, int s)
+execlists_active_unlock_bh(struct intel_engine_execlists *execlists)
{
tasklet_unlock(&execlists->tasklet);
- splraise(s); /* restore softirq, and kick ksoftirqd! */
+ local_bh_enable(); /* restore softirq, and kick ksoftirqd! */
}
#endif
Index: src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c:1.8 Sun Dec 19 12:33:56 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_engine_cs.c,v 1.8 2021/12/19 12:33:56 riastradh Exp $ */
+/* $NetBSD: intel_engine_cs.c,v 1.9 2021/12/19 12:40:43 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_engine_cs.c,v 1.8 2021/12/19 12:33:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_engine_cs.c,v 1.9 2021/12/19 12:40:43 riastradh Exp $");
#include <drm/drm_print.h>
@@ -1375,10 +1375,10 @@ static void intel_engine_print_registers
idx, hws[idx * 2], hws[idx * 2 + 1]);
}
-#ifdef __linux__
- execlists_active_lock_bh(execlists);
-#else
+#ifdef __NetBSD__
int s = execlists_active_lock_bh(execlists);
+#else
+ execlists_active_lock_bh(execlists);
#endif
rcu_read_lock();
for (port = execlists->active; (rq = *port); port++) {
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c:1.5 Sun Dec 19 09:54:48 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_ci_dpm.c,v 1.5 2021/12/19 09:54:48 riastradh Exp $ */
+/* $NetBSD: radeon_ci_dpm.c,v 1.6 2021/12/19 12:40:43 riastradh Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_ci_dpm.c,v 1.5 2021/12/19 09:54:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ci_dpm.c,v 1.6 2021/12/19 12:40:43 riastradh Exp $");
#include <linux/firmware.h>
#include <linux/pci.h>
@@ -5687,7 +5687,7 @@ int ci_dpm_init(struct radeon_device *rd
u8 frev, crev;
struct ci_power_info *pi;
enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN;
-#ifdef __linux__
+#ifndef __NetBSD__ /* XXX radeon pcie */
struct pci_dev *root = rdev->pdev->bus->self;
#endif
int ret;
@@ -5697,7 +5697,7 @@ int ci_dpm_init(struct radeon_device *rd
return -ENOMEM;
rdev->pm.dpm.priv = pi;
-#ifdef __linux__
+#ifndef __NetBSD__ /* XXX radeon pcie */
if (!pci_is_root_bus(rdev->pdev->bus))
speed_cap = pcie_get_speed_cap(root);
#endif
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.7 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.7 Sun Dec 19 09:56:36 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c Sun Dec 19 12:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_si_dpm.c,v 1.7 2021/12/19 09:56:36 riastradh Exp $ */
+/* $NetBSD: radeon_si_dpm.c,v 1.8 2021/12/19 12:40:43 riastradh Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.7 2021/12/19 09:56:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.8 2021/12/19 12:40:43 riastradh Exp $");
#include <linux/math64.h>
#include <linux/pci.h>
@@ -6908,7 +6908,7 @@ int si_dpm_init(struct radeon_device *rd
struct si_power_info *si_pi;
struct atom_clock_dividers dividers;
enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN;
-#ifdef __linux__ /* XXX radeon pcie */
+#ifndef __NetBSD__ /* XXX radeon pcie */
struct pci_dev *root = rdev->pdev->bus->self;
#endif
int ret;
@@ -6921,7 +6921,7 @@ int si_dpm_init(struct radeon_device *rd
eg_pi = &ni_pi->eg;
pi = &eg_pi->rv7xx;
-#ifdef __linux__
+#ifndef __NetBSD__ /* XXX radeon pcie */
if (!pci_is_root_bus(rdev->pdev->bus))
speed_cap = pcie_get_speed_cap(root);
#endif
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.28 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.29
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.28 Sun Dec 19 11:21:12 2021
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Sun Dec 19 12:40:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo.c,v 1.28 2021/12/19 11:21:12 riastradh Exp $ */
+/* $NetBSD: ttm_bo.c,v 1.29 2021/12/19 12:40:44 riastradh Exp $ */
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
/**************************************************************************
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.28 2021/12/19 11:21:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.29 2021/12/19 12:40:44 riastradh Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -57,27 +57,29 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1
#include <linux/nbsd-namespace.h>
-#ifndef __NetBSD__
+#ifndef __NetBSD__ /* XXX sysfs */
static void ttm_bo_global_kobj_release(struct kobject *kobj);
#endif
-#ifdef __linux__ /* XXX sysfs */
/**
* ttm_global_mutex - protecting the global BO state
*/
+#ifdef __NetBSD__
+static struct mutex ttm_global_mutex;
+unsigned ttm_bo_glob_use_count;
+struct ttm_bo_global ttm_bo_glob;
+#else
DEFINE_MUTEX(ttm_global_mutex);
unsigned ttm_bo_glob_use_count;
struct ttm_bo_global ttm_bo_glob;
EXPORT_SYMBOL(ttm_bo_glob);
+#endif
+#ifndef __NetBSD__ /* XXX sysfs */
static struct attribute ttm_bo_count = {
.name = "bo_count",
.mode = S_IRUGO
};
-#else
-static struct mutex ttm_global_mutex;
-unsigned ttm_bo_glob_use_count;
-struct ttm_bo_global ttm_bo_glob;
#endif
/* default destructor */
Index: src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_api.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_api.h:1.7 src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_api.h:1.8
--- src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_api.h:1.7 Sun Dec 19 09:55:14 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_api.h Sun Dec 19 12:40:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_api.h,v 1.7 2021/12/19 09:55:14 riastradh Exp $ */
+/* $NetBSD: ttm_bo_api.h,v 1.8 2021/12/19 12:40:44 riastradh Exp $ */
/**************************************************************************
*
@@ -775,7 +775,7 @@ static inline bool ttm_bo_uses_embedded_
/* Default number of pre-faulted pages in the TTM fault handler */
#define TTM_BO_VM_NUM_PREFAULT 16
-#ifdef __linux__
+#ifndef __NetBSD__
vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_object *bo,
struct vm_fault *vmf);
@@ -791,6 +791,6 @@ void ttm_bo_vm_close(struct vm_area_stru
int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
void *buf, int len, int write);
-#endif
+#endif /* __NetBSD__ */
#endif
Index: src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_set_memory.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_set_memory.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_set_memory.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_set_memory.h:1.3 Sun Dec 19 09:58:23 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/ttm/ttm_set_memory.h Sun Dec 19 12:40:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_set_memory.h,v 1.3 2021/12/19 09:58:23 riastradh Exp $ */
+/* $NetBSD: ttm_set_memory.h,v 1.4 2021/12/19 12:40:44 riastradh Exp $ */
/**************************************************************************
*
@@ -35,7 +35,7 @@
#include <linux/mm.h>
-#if defined(CONFIG_X86) && defined(__linux__)
+#if defined(CONFIG_X86) && !defined(__NetBSD__)
#include <asm/set_memory.h>
