[src/netbsd-6-0]: src/sys/dev/pci Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/2d6734ff487f
branches:  netbsd-6-0
changeset: 774974:2d6734ff487f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Aug 08 03:51:59 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1105):
        src/sys/dev/pci/agp_i810.c      1.108-1.110 via patch.
Bind i810 dcache pages at the requested offset, not at VA start.
>From John D Baker in PR xsrc/48344.

diffstat:

 sys/dev/pci/agp_i810.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 40580d21c57c -r 2d6734ff487f sys/dev/pci/agp_i810.c
--- a/sys/dev/pci/agp_i810.c    Fri Aug 08 03:14:10 2014 +0000
+++ b/sys/dev/pci/agp_i810.c    Fri Aug 08 03:51:59 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: agp_i810.c,v 1.73 2011/04/04 20:37:56 dyoung Exp $     */
+/*     $NetBSD: agp_i810.c,v 1.73.16.1 2014/08/08 03:51:59 msaitoh Exp $       */
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.73 2011/04/04 20:37:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.73.16.1 2014/08/08 03:51:59 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1028,7 +1028,8 @@
                return EINVAL;
 
        for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE)
-               agp_i810_write_gtt_entry(isc, i, i | 3);
+               agp_i810_write_gtt_entry(isc, offset + i, i | 3);
+       mem->am_offset = offset;
        mem->am_is_bound = 1;
        return 0;
 }
@@ -1057,7 +1058,8 @@
                return EINVAL;
 
        for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE)
-               agp_i810_write_gtt_entry(isc, i, 0);
+               agp_i810_write_gtt_entry(isc, mem->am_offset + i, 0);
+       mem->am_offset = 0;
        mem->am_is_bound = 0;
        return 0;
 }