Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Hack up __iomem here.
details: https://anonhg.NetBSD.org/src/rev/cc8fc974eef6
branches: trunk
changeset: 1028444:cc8fc974eef6
user: riastradh <riastradh%NetBSD.org@localhost>
date: Sun Dec 19 11:04:05 2021 +0000
description:
Hack up __iomem here.
diffstat:
sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h | 10 +++++++++-
sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diffs (57 lines):
diff -r 3f8629ecf700 -r cc8fc974eef6 sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h
--- a/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h Sun Dec 19 11:03:57 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h Sun Dec 19 11:04:05 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_engine_types.h,v 1.2 2021/12/18 23:45:30 riastradh Exp $ */
+/* $NetBSD: intel_engine_types.h,v 1.3 2021/12/19 11:04:05 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -163,6 +163,10 @@
*/
bool no_priolist;
+#ifdef __NetBSD__
+# define __iomem
+#endif
+
/**
* @submit_reg: gen-specific execlist submission register
* set to the ExecList Submission Port (elsp) register pre-Gen11 and to
@@ -176,6 +180,10 @@
*/
u32 __iomem *ctrl_reg;
+#ifdef __NetBSD__
+# undef __iomem
+#endif
+
#define EXECLIST_MAX_PORTS 2
/**
* @active: the currently known context executing on HW
diff -r 3f8629ecf700 -r cc8fc974eef6 sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h Sun Dec 19 11:03:57 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h Sun Dec 19 11:04:05 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_uncore.h,v 1.3 2021/12/19 01:43:37 riastradh Exp $ */
+/* $NetBSD: intel_uncore.h,v 1.4 2021/12/19 11:04:05 riastradh Exp $ */
/*
* Copyright © 2017 Intel Corporation
@@ -109,8 +109,16 @@
};
struct intel_uncore {
+#ifdef __NetBSD__
+# define __iomem
+#endif
+
void __iomem *regs;
+#ifdef __NetBSD__
+# undef __iomem
+#endif
+
struct drm_i915_private *i915;
struct intel_runtime_pm *rpm;
Home |
Main Index |
Thread Index |
Old Index