Module Name: src
Committed By: riastradh
Date: Mon Aug 27 16:15:09 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:
Linux uses uint64 for these parameters now, so follow suit.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/i915drm/intel_gtt.c
cvs rdiff -u -r1.6 -r1.7 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.9 src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.10
--- src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.9 Mon Aug 27 14:48:35 2018
+++ src/sys/external/bsd/drm2/i915drm/intel_gtt.c Mon Aug 27 16:15:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_gtt.c,v 1.9 2018/08/27 14:48:35 riastradh Exp $ */
+/* $NetBSD: intel_gtt.c,v 1.10 2018/08/27 16:15:09 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.9 2018/08/27 14:48:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.10 2018/08/27 16:15:09 riastradh Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -54,8 +54,8 @@ static struct {
} intel_gtt;
void
-intel_gtt_get(size_t *va_size, size_t *stolen_size, bus_addr_t *aper_base,
- unsigned long *aper_size)
+intel_gtt_get(uint64_t *va_size, size_t *stolen_size, bus_addr_t *aper_base,
+ uint64_t *aper_size)
{
struct agp_softc *const sc = agp_i810_sc;
Index: src/sys/external/bsd/drm2/include/drm/intel-gtt.h
diff -u src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.6 src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.7
--- src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.6 Mon Aug 27 07:17:01 2018
+++ src/sys/external/bsd/drm2/include/drm/intel-gtt.h Mon Aug 27 16:15:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel-gtt.h,v 1.6 2018/08/27 07:17:01 riastradh Exp $ */
+/* $NetBSD: intel-gtt.h,v 1.7 2018/08/27 16:15:09 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,10 +38,10 @@
struct pci_dev;
struct agp_bridge_data;
-void intel_gtt_get(size_t * /* GPU VA size in bytes */,
+void intel_gtt_get(uint64_t * /* GPU VA size in bytes */,
size_t * /* graphics stolen memory in bytes */,
bus_addr_t * /* aperture base */,
- unsigned long * /* aperture size in bytes */);
+ uint64_t * /* aperture size in bytes */);
int intel_gmch_probe(struct pci_dev *, struct pci_dev *,
struct agp_bridge_data *);
void intel_gmch_remove(void);
