Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:17:01 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/i915drm: intel_gtt.c
src/sys/external/bsd/drm2/include/drm: intel-gtt.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/i915drm/intel_gtt.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/include/drm/intel-gtt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/i915drm/intel_gtt.c
diff -u src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.7 src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.8
--- src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.7 Mon Aug 27 00:51:37 2018
+++ src/sys/external/bsd/drm2/i915drm/intel_gtt.c Mon Aug 27 07:17:01 2018
@@ -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 @@ intel_gtt_chipset_flush(void)
}
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);
Index: src/sys/external/bsd/drm2/include/drm/intel-gtt.h
diff -u src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.5 src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.6
--- src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.5 Fri Mar 6 22:03:06 2015
+++ src/sys/external/bsd/drm2/include/drm/intel-gtt.h Mon Aug 27 07:17:01 2018
@@ -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 @@ int intel_gmch_probe(struct pci_dev *, s
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
