Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:05:01 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_bufs.c
Log Message:
agp_info.ai_aperture_size, not agp_info.aper_size << 20, in drm_bufs.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \
src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
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/dist/drm/drm_bufs.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.4 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.5
--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.4 Wed Jul 24 02:04:46 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c Wed Jul 24 02:05:01 2013
@@ -268,11 +268,19 @@ static int drm_addmap_core(struct drm_de
* address if the map's offset isn't already within the
* aperture.
*/
+#ifdef __NetBSD__
+ if (map->offset < dev->agp->base ||
+ map->offset > dev->agp->base +
+ dev->agp->agp_info.ai_aperture_size - 1) {
+ map->offset += dev->agp->base;
+ }
+#else
if (map->offset < dev->agp->base ||
map->offset > dev->agp->base +
dev->agp->agp_info.aper_size * 1024 * 1024 - 1) {
map->offset += dev->agp->base;
}
+#endif
map->mtrr = dev->agp->agp_mtrr; /* for getmap */
/* This assumes the DRM is in total control of AGP space.
