[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm agp_info.ai_aperture...

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

details:   https://anonhg.NetBSD.org/src/rev/3408a9e1134f
branches:  riastradh-drm2
changeset: 788068:3408a9e1134f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 02:05:01 2013 +0000

description:
agp_info.ai_aperture_size, not agp_info.aper_size << 20, in drm_bufs.c.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_bufs.c |  8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r b18cc3f97b23 -r 3408a9e1134f sys/external/bsd/drm2/dist/drm/drm_bufs.c
--- a/sys/external/bsd/drm2/dist/drm/drm_bufs.c Wed Jul 24 02:04:46 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_bufs.c Wed Jul 24 02:05:01 2013 +0000
@@ -268,11 +268,19 @@
                 * 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.