CVS commit: [netbsd-6-0] src/sys/dev/pci

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Fri Aug  8 03:51:59 UTC 2014

Modified Files:
        src/sys/dev/pci [netbsd-6-0]: agp_i810.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.16.1 src/sys/dev/pci/agp_i810.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/dev/pci/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.73 src/sys/dev/pci/agp_i810.c:1.73.16.1
--- src/sys/dev/pci/agp_i810.c:1.73	Mon Apr  4 20:37:56 2011
+++ src/sys/dev/pci/agp_i810.c	Fri Aug  8 03:51:59 2014
@@ -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 @@ agp_i810_bind_memory(struct agp_softc *s
 		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 @@ agp_i810_unbind_memory(struct agp_softc 
 		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;
 }