Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:37:36 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: intel_gtt_subr.c
src/sys/external/bsd/drm2/include/drm: intel-gtt.h
Log Message:
i915: Make intel_gtt_get prototype match Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c
cvs rdiff -u -r1.9 -r1.10 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_subr.c
diff -u src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c:1.2 src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c:1.3
--- src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c:1.2 Sun Dec 19 12:27:02 2021
+++ src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c Sun Dec 19 12:37:36 2021
@@ -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 @@ static const struct pci_device_id intel_
};
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;
Index: src/sys/external/bsd/drm2/include/drm/intel-gtt.h
diff -u src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.9 src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.10
--- src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.9 Sun Dec 19 11:39:56 2021
+++ src/sys/external/bsd/drm2/include/drm/intel-gtt.h Sun Dec 19 12:37:36 2021
@@ -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 @@ struct sg_table;
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);
