Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:16:08 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gt: gen6_ppgtt.c
Log Message:
i915: ioread32 -> bus_space_read_4
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c
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/gt/gen6_ppgtt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c:1.4 Sun Dec 19 11:15:04 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c Sun Dec 19 11:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gen6_ppgtt.c,v 1.4 2021/12/19 11:15:04 riastradh Exp $ */
+/* $NetBSD: gen6_ppgtt.c,v 1.5 2021/12/19 11:16:08 riastradh Exp $ */
// SPDX-License-Identifier: MIT
/*
@@ -6,7 +6,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gen6_ppgtt.c,v 1.4 2021/12/19 11:15:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gen6_ppgtt.c,v 1.5 2021/12/19 11:16:08 riastradh Exp $");
#include <linux/log2.h>
@@ -202,7 +202,11 @@ static void gen6_flush_pd(struct gen6_pp
gen6_write_pde(ppgtt, pde, pt);
mb();
+#ifdef __NetBSD__
+ (void)bus_space_read_4(ppgtt->pd_bst, ppgtt->pd_bsh, 4*(pde - 1));
+#else
ioread32(ppgtt->pd_addr + pde - 1);
+#endif
gen6_ggtt_invalidate(ppgtt->base.vm.gt->ggtt);
mb();
