Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:04:05 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_uncore.h
src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_engine_types.h
Log Message:
Hack up __iomem here.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.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/i915/intel_uncore.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h:1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h:1.3 Sun Dec 19 01:43:37 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.h Sun Dec 19 11:04:05 2021
@@ -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_forcewake_range {
};
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;
Index: src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h:1.2 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h:1.2 Sat Dec 18 23:45:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_types.h Sun Dec 19 11:04:05 2021
@@ -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 @@ struct intel_engine_execlists {
*/
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 @@ struct intel_engine_execlists {
*/
u32 __iomem *ctrl_reg;
+#ifdef __NetBSD__
+# undef __iomem
+#endif
+
#define EXECLIST_MAX_PORTS 2
/**
* @active: the currently known context executing on HW
