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

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

details:   https://anonhg.NetBSD.org/src/rev/ead33d824a2b
branches:  trunk
changeset: 365136:ead33d824a2b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Apr 09 19:59:08 2022 +0000

description:
nouveau: Omit needless local patch.

This code probably once called ioread32/iowrite32 or something, but
no longer.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c |  41 +---------
 1 files changed, 2 insertions(+), 39 deletions(-)

diffs (69 lines):

diff -r 1bb50782ca21 -r ead33d824a2b sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c     Sat Apr 09 16:02:14 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c     Sat Apr 09 19:59:08 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_subdev_instmem_base.c,v 1.8 2021/12/19 11:34:45 riastradh Exp $   */
+/*     $NetBSD: nouveau_nvkm_subdev_instmem_base.c,v 1.9 2022/04/09 19:59:08 riastradh Exp $   */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_base.c,v 1.8 2021/12/19 11:34:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_base.c,v 1.9 2022/04/09 19:59:08 riastradh Exp $");
 
 #include "priv.h"
 
@@ -34,37 +34,6 @@
 #  define      __iomem __nvkm_memory_iomem
 #endif
 
-#ifdef __NetBSD__
-
-/*
- * XXX I think this should be done with bus_space, but the depth of
- * abstractions is dizzying and I'm not actually sure where these
- * pointers come from.
- */
-
-#  define      ioread32_native         fake_ioread32_native
-#  define      iowrite32_native        fake_iowrite32_native
-
-static inline uint32_t
-ioread32_native(const void __iomem *ptr)
-{
-       uint32_t v;
-
-       v = *(const uint32_t __iomem *)ptr;
-       membar_consumer();
-
-       return v;
-}
-
-static inline void
-iowrite32_native(uint32_t v, void __iomem *ptr)
-{
-
-       membar_producer();
-       *(uint32_t __iomem *)ptr = v;
-}
-
-#endif
 /******************************************************************************
  * instmem object base implementation
  *****************************************************************************/
@@ -88,12 +57,6 @@
        iobj->suspend = NULL;
 }
 
-#ifdef __NetBSD__
-#  undef       ioread32_native
-#  undef       iowrite32_native
-#endif
-
-
 static int
 nvkm_instobj_save(struct nvkm_instobj *iobj)
 {