[src/trunk]: src/sys/external/bsd/drm2 i915: Make intel_gtt_get prototype mat...

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

details:   https://anonhg.NetBSD.org/src/rev/87a588e46203
branches:  trunk
changeset: 1028977:87a588e46203
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:37:36 2021 +0000

description:
i915: Make intel_gtt_get prototype match Linux.

diffstat:

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

diffs (46 lines):

diff -r 993fbc6b29ed -r 87a588e46203 sys/external/bsd/drm2/i915drm/intel_gtt_subr.c
--- a/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c    Sun Dec 19 12:37:28 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c    Sun Dec 19 12:37:36 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_gtt_subr.c,v 1.2 2021/12/19 12:27:02 riastradh Exp $     */
+/*     $NetBSD: intel_gtt_subr.c,v 1.3 2021/12/19 12:37:36 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_subr.c,v 1.2 2021/12/19 12:27:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_gtt_subr.c,v 1.3 2021/12/19 12:37:36 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/bus.h>
@@ -398,7 +398,8 @@
 };
 
 void
-intel_gtt_get(uint64_t *va_size, bus_addr_t *aper_base, uint64_t *aper_size)
+intel_gtt_get(uint64_t *va_size, bus_addr_t *aper_base,
+    resource_size_t *aper_size)
 {
        struct agp_softc *sc;
        pci_chipset_tag_t pc;
diff -r 993fbc6b29ed -r 87a588e46203 sys/external/bsd/drm2/include/drm/intel-gtt.h
--- a/sys/external/bsd/drm2/include/drm/intel-gtt.h     Sun Dec 19 12:37:28 2021 +0000
+++ b/sys/external/bsd/drm2/include/drm/intel-gtt.h     Sun Dec 19 12:37:36 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel-gtt.h,v 1.9 2021/12/19 11:39:56 riastradh Exp $  */
+/*     $NetBSD: intel-gtt.h,v 1.10 2021/12/19 12:37:36 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 
 void   intel_gtt_get(uint64_t * /* GPU VA size in bytes */,
            bus_addr_t * /* aperture base */,
-           uint64_t * /* aperture size in bytes */);
+           resource_size_t * /* aperture size in bytes */);
 int    intel_gmch_probe(struct pci_dev *, struct pci_dev *,
            struct agp_bridge_data *);
 void   intel_gmch_remove(void);