[src/trunk]: src/sys/external/bsd/drm2 Call it intel_gtt_insert_sg_entries fo...

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

details:   https://anonhg.NetBSD.org/src/rev/94e84258150e
branches:  trunk
changeset: 992620:94e84258150e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:17:01 2018 +0000

description:
Call it intel_gtt_insert_sg_entries for expedience.

It uses a bus_dmamap, not a Linux scatterlist a.k.a. sg, but
otherwise it functions the same way and this avoids patching
upstream.

diffstat:

 sys/external/bsd/drm2/i915drm/intel_gtt.c     |  7 ++++---
 sys/external/bsd/drm2/include/drm/intel-gtt.h |  4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 7b21a0fd3817 -r 94e84258150e sys/external/bsd/drm2/i915drm/intel_gtt.c
--- a/sys/external/bsd/drm2/i915drm/intel_gtt.c Mon Aug 27 07:16:50 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/intel_gtt.c Mon Aug 27 07:17:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_gtt.c,v 1.7 2018/08/27 00:51:37 riastradh Exp $  */
+/*     $NetBSD: intel_gtt.c,v 1.8 2018/08/27 07:17:01 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 /* Intel GTT stubs */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.7 2018/08/27 00:51:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.8 2018/08/27 07:17:01 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/bus.h>
@@ -144,7 +144,8 @@
 }
 
 void
-intel_gtt_insert_entries(bus_dmamap_t dmamap, unsigned va_page, unsigned flags)
+intel_gtt_insert_sg_entries(bus_dmamap_t dmamap, unsigned va_page,
+    unsigned flags)
 {
        struct agp_i810_softc *const isc = agp_i810_sc->as_chipc;
        off_t va = (va_page << PAGE_SHIFT);
diff -r 7b21a0fd3817 -r 94e84258150e sys/external/bsd/drm2/include/drm/intel-gtt.h
--- a/sys/external/bsd/drm2/include/drm/intel-gtt.h     Mon Aug 27 07:16:50 2018 +0000
+++ b/sys/external/bsd/drm2/include/drm/intel-gtt.h     Mon Aug 27 07:17:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel-gtt.h,v 1.5 2015/03/06 22:03:06 riastradh Exp $  */
+/*     $NetBSD: intel-gtt.h,v 1.6 2018/08/27 07:17:01 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
 void   intel_gmch_remove(void);
 bool   intel_enable_gtt(void);
 void   intel_gtt_chipset_flush(void);
-void   intel_gtt_insert_entries(bus_dmamap_t, unsigned, unsigned);
+void   intel_gtt_insert_sg_entries(bus_dmamap_t, unsigned, unsigned);
 void   intel_gtt_clear_range(unsigned, unsigned);
 
 #define        AGP_USER_MEMORY         1