[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit w...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/00c0807b41e4
branches:  trunk
changeset: 955936:00c0807b41e4
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 17 10:47:10 2020 +0000

description:
wmb (dsb ishst) is not the same as membar_producer (dmb ishst) on aarch64

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/fbmem.h |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r dd54328ef748 -r 00c0807b41e4 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/fbmem.h
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/fbmem.h        Sat Oct 17 10:46:39 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/fbmem.h        Sat Oct 17 10:47:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fbmem.h,v 1.3 2018/08/27 14:51:33 riastradh Exp $      */
+/*     $NetBSD: fbmem.h,v 1.4 2020/10/17 10:47:10 jmcneill Exp $       */
 
 /*
  * Copyright (C) 2010 Francisco Jerez.
@@ -112,11 +112,10 @@
 {
        u8 __iomem *p = io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
        iowrite32(val, p + (off & ~PAGE_MASK));
+       wmb();
 #ifdef __NetBSD__
-       membar_producer();
        io_mapping_unmap_atomic(fb, __UNVOLATILE(p));
 #else
-       wmb();
        io_mapping_unmap_atomic(p);
 #endif
 }