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/gt i915: ioread32 -> bus...



details:   https://anonhg.NetBSD.org/src/rev/c3417cf0c72b
branches:  trunk
changeset: 1028534:c3417cf0c72b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:16:08 2021 +0000

description:
i915: ioread32 -> bus_space_read_4

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r aec667a87a08 -r c3417cf0c72b sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c
--- a/sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c       Sun Dec 19 11:16:00 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c       Sun Dec 19 11:16:08 2021 +0000
@@ -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 @@
                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();
 



Home | Main Index | Thread Index | Old Index