[src/trunk]: src/sys/external/bsd/drm2/pci Rename drm_core_ioremap -> drm_leg...

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

details:   https://anonhg.NetBSD.org/src/rev/bf253b026c81
branches:  trunk
changeset: 992484:bf253b026c81
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:44:14 2018 +0000

description:
Rename drm_core_ioremap -> drm_legacy_ioremap as upstream.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_bufs.c |  12 ++++++------
 sys/external/bsd/drm2/drm/drm_memory.c    |   8 ++++----
 sys/external/bsd/drm2/pci/drm_pci.c       |   6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diffs (117 lines):

diff -r 247be8ef791e -r bf253b026c81 sys/external/bsd/drm2/dist/drm/drm_bufs.c
--- a/sys/external/bsd/drm2/dist/drm/drm_bufs.c Mon Aug 27 06:44:00 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_bufs.c Mon Aug 27 06:44:14 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_bufs.c,v 1.8 2018/08/27 04:58:19 riastradh Exp $   */
+/*     $NetBSD: drm_bufs.c,v 1.9 2018/08/27 06:44:14 riastradh Exp $   */
 
 /*
  * Legacy: Generic DRM Buffer Management
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.8 2018/08/27 04:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.9 2018/08/27 06:44:14 riastradh Exp $");
 
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
@@ -214,7 +214,7 @@
                }
                if (map->type == _DRM_REGISTERS) {
 #ifdef __NetBSD__
-                       drm_core_ioremap(map, dev);
+                       drm_legacy_ioremap(map, dev);
 #else
                        if (map->flags & _DRM_WRITE_COMBINING)
                                map->handle = ioremap_wc(map->offset,
@@ -352,7 +352,7 @@
        if (!list) {
                if (map->type == _DRM_REGISTERS)
 #ifdef __NetBSD__
-                       drm_core_ioremapfree(map, dev);
+                       drm_legacy_ioremapfree(map, dev);
 #else
                        iounmap(map->handle);
 #endif
@@ -373,7 +373,7 @@
        if (ret) {
                if (map->type == _DRM_REGISTERS)
 #ifdef __NetBSD__              /* XXX What about other map types...?  */
-                       drm_core_ioremapfree(map, dev);
+                       drm_legacy_ioremapfree(map, dev);
 #else
                        iounmap(map->handle);
 #endif
@@ -494,7 +494,7 @@
        switch (map->type) {
        case _DRM_REGISTERS:
 #ifdef __NetBSD__
-               drm_core_ioremapfree(map, dev);
+               drm_legacy_ioremapfree(map, dev);
 #else
                iounmap(map->handle);
 #endif
diff -r 247be8ef791e -r bf253b026c81 sys/external/bsd/drm2/drm/drm_memory.c
--- a/sys/external/bsd/drm2/drm/drm_memory.c    Mon Aug 27 06:44:00 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drm_memory.c    Mon Aug 27 06:44:14 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_memory.c,v 1.10 2016/03/06 10:59:56 mlelstv Exp $  */
+/*     $NetBSD: drm_memory.c,v 1.11 2018/08/27 06:44:15 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.10 2016/03/06 10:59:56 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.11 2018/08/27 06:44:15 riastradh Exp $");
 
 #if defined(__i386__) || defined(__x86_64__)
 
@@ -94,7 +94,7 @@
 }
 
 void
-drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev)
+drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev)
 {
        const bus_space_tag_t bst = dev->bst;
        unsigned int unit;
@@ -151,7 +151,7 @@
 }
 
 void
-drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
+drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
 {
        if (map->lm_data.bus_space.bus_map != NULL) {
                bus_space_unmap(map->lm_data.bus_space.bst,
diff -r 247be8ef791e -r bf253b026c81 sys/external/bsd/drm2/pci/drm_pci.c
--- a/sys/external/bsd/drm2/pci/drm_pci.c       Mon Aug 27 06:44:00 2018 +0000
+++ b/sys/external/bsd/drm2/pci/drm_pci.c       Mon Aug 27 06:44:14 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_pci.c,v 1.19 2018/08/27 06:06:42 riastradh Exp $   */
+/*     $NetBSD: drm_pci.c,v 1.20 2018/08/27 06:44:15 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.19 2018/08/27 06:06:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.20 2018/08/27 06:44:15 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
@@ -144,7 +144,7 @@
                        continue;
                }
 
-               /* Inquire about it.  We'll map it in drm_core_ioremap.  */
+               /* Inquire about it.  We'll map it in drm_legacy_ioremap.  */
                if (pci_mapreg_info(pa->pa_pc, pa->pa_tag, reg, type,
                        &bm->bm_base, &bm->bm_size, &bm->bm_flags) != 0) {
                        aprint_debug_dev(self, "map %u failed\n", unit);