| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: agp_i810.c,v 1.62 2009/01/27 08:39:34 markd Exp $ */ | | 1 | /* $NetBSD: agp_i810.c,v 1.63 2009/02/19 05:58:37 markd Exp $ */ |
2 | | | 2 | |
3 | /*- | | 3 | /*- |
4 | * Copyright (c) 2000 Doug Rabson | | 4 | * Copyright (c) 2000 Doug Rabson |
5 | * Copyright (c) 2000 Ruslan Ermilov | | 5 | * Copyright (c) 2000 Ruslan Ermilov |
6 | * All rights reserved. | | 6 | * All rights reserved. |
7 | * | | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | | 8 | * Redistribution and use in source and binary forms, with or without |
9 | * modification, are permitted provided that the following conditions | | 9 | * modification, are permitted provided that the following conditions |
10 | * are met: | | 10 | * are met: |
11 | * 1. Redistributions of source code must retain the above copyright | | 11 | * 1. Redistributions of source code must retain the above copyright |
12 | * notice, this list of conditions and the following disclaimer. | | 12 | * notice, this list of conditions and the following disclaimer. |
13 | * 2. Redistributions in binary form must reproduce the above copyright | | 13 | * 2. Redistributions in binary form must reproduce the above copyright |
14 | * notice, this list of conditions and the following disclaimer in the | | 14 | * notice, this list of conditions and the following disclaimer in the |
| @@ -20,27 +20,27 @@ | | | @@ -20,27 +20,27 @@ |
20 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | | 20 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE |
21 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | | 21 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
22 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | | 22 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
23 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | | 23 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
24 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | | 24 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
25 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | | 25 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | | 26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
27 | * SUCH DAMAGE. | | 27 | * SUCH DAMAGE. |
28 | * | | 28 | * |
29 | * $FreeBSD: src/sys/pci/agp_i810.c,v 1.4 2001/07/05 21:28:47 jhb Exp $ | | 29 | * $FreeBSD: src/sys/pci/agp_i810.c,v 1.4 2001/07/05 21:28:47 jhb Exp $ |
30 | */ | | 30 | */ |
31 | | | 31 | |
32 | #include <sys/cdefs.h> | | 32 | #include <sys/cdefs.h> |
33 | __KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.62 2009/01/27 08:39:34 markd Exp $"); | | 33 | __KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.63 2009/02/19 05:58:37 markd Exp $"); |
34 | | | 34 | |
35 | #include <sys/param.h> | | 35 | #include <sys/param.h> |
36 | #include <sys/systm.h> | | 36 | #include <sys/systm.h> |
37 | #include <sys/malloc.h> | | 37 | #include <sys/malloc.h> |
38 | #include <sys/kernel.h> | | 38 | #include <sys/kernel.h> |
39 | #include <sys/proc.h> | | 39 | #include <sys/proc.h> |
40 | #include <sys/device.h> | | 40 | #include <sys/device.h> |
41 | #include <sys/conf.h> | | 41 | #include <sys/conf.h> |
42 | | | 42 | |
43 | #include <uvm/uvm_extern.h> | | 43 | #include <uvm/uvm_extern.h> |
44 | | | 44 | |
45 | #include <dev/pci/pcivar.h> | | 45 | #include <dev/pci/pcivar.h> |
46 | #include <dev/pci/pcireg.h> | | 46 | #include <dev/pci/pcireg.h> |
| @@ -283,26 +283,27 @@ agp_i810_attach(device_t parent, device_ | | | @@ -283,26 +283,27 @@ agp_i810_attach(device_t parent, device_ |
283 | case PCI_PRODUCT_INTEL_82965G_IGD_1: | | 283 | case PCI_PRODUCT_INTEL_82965G_IGD_1: |
284 | case PCI_PRODUCT_INTEL_82946GZ_IGD: | | 284 | case PCI_PRODUCT_INTEL_82946GZ_IGD: |
285 | case PCI_PRODUCT_INTEL_82G35_IGD: | | 285 | case PCI_PRODUCT_INTEL_82G35_IGD: |
286 | case PCI_PRODUCT_INTEL_82G35_IGD_1: | | 286 | case PCI_PRODUCT_INTEL_82G35_IGD_1: |
287 | isc->chiptype = CHIP_I965; | | 287 | isc->chiptype = CHIP_I965; |
288 | break; | | 288 | break; |
289 | case PCI_PRODUCT_INTEL_82Q35_IGD: | | 289 | case PCI_PRODUCT_INTEL_82Q35_IGD: |
290 | case PCI_PRODUCT_INTEL_82Q35_IGD_1: | | 290 | case PCI_PRODUCT_INTEL_82Q35_IGD_1: |
291 | case PCI_PRODUCT_INTEL_82G33_IGD: | | 291 | case PCI_PRODUCT_INTEL_82G33_IGD: |
292 | case PCI_PRODUCT_INTEL_82G33_IGD_1: | | 292 | case PCI_PRODUCT_INTEL_82G33_IGD_1: |
293 | case PCI_PRODUCT_INTEL_82Q33_IGD: | | 293 | case PCI_PRODUCT_INTEL_82Q33_IGD: |
294 | case PCI_PRODUCT_INTEL_82Q33_IGD_1: | | 294 | case PCI_PRODUCT_INTEL_82Q33_IGD_1: |
295 | isc->chiptype = CHIP_G33; | | 295 | isc->chiptype = CHIP_G33; |
| | | 296 | break; |
296 | case PCI_PRODUCT_INTEL_82GM45_IGD: | | 297 | case PCI_PRODUCT_INTEL_82GM45_IGD: |
297 | case PCI_PRODUCT_INTEL_82GM45_IGD_1: | | 298 | case PCI_PRODUCT_INTEL_82GM45_IGD_1: |
298 | case PCI_PRODUCT_INTEL_82IGD_E_IGD: | | 299 | case PCI_PRODUCT_INTEL_82IGD_E_IGD: |
299 | case PCI_PRODUCT_INTEL_82Q45_IGD: | | 300 | case PCI_PRODUCT_INTEL_82Q45_IGD: |
300 | case PCI_PRODUCT_INTEL_82G45_IGD: | | 301 | case PCI_PRODUCT_INTEL_82G45_IGD: |
301 | isc->chiptype = CHIP_G4X; | | 302 | isc->chiptype = CHIP_G4X; |
302 | break; | | 303 | break; |
303 | } | | 304 | } |
304 | | | 305 | |
305 | switch (isc->chiptype) { | | 306 | switch (isc->chiptype) { |
306 | case CHIP_I915: | | 307 | case CHIP_I915: |
307 | case CHIP_G33: | | 308 | case CHIP_G33: |
308 | apbase = AGP_I915_GMADR; | | 309 | apbase = AGP_I915_GMADR; |