[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.26 (requested by tron in...

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

details:   https://anonhg.NetBSD.org/src/rev/11c7a705a633
branches:  netbsd-1-6
changeset: 530273:11c7a705a633
user:      grant <grant%NetBSD.org@localhost>
date:      Mon Jun 16 12:48:34 2003 +0000

description:
Pull up revision 1.26 (requested by tron in ticket #1181):

Don't match a PCI graphics card in a system which supports an AGP.
Patch supplied by Quentin Garnier in PR kern/19256.

diffstat:

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

diffs (27 lines):

diff -r ccf60c679b2d -r 11c7a705a633 sys/dev/pci/agp.c
--- a/sys/dev/pci/agp.c Mon Jun 16 12:45:13 2003 +0000
+++ b/sys/dev/pci/agp.c Mon Jun 16 12:48:34 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: agp.c,v 1.14.10.2 2003/01/28 07:36:16 jmc Exp $        */
+/*     $NetBSD: agp.c,v 1.14.10.3 2003/06/16 12:48:34 grant Exp $      */
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -65,7 +65,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.14.10.2 2003/01/28 07:36:16 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.14.10.3 2003/06/16 12:48:34 grant Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -350,6 +350,8 @@
 {
        if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY &&
            PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_DISPLAY_VGA)
+               if (pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP,
+                   NULL, NULL))
                return 1;
 
        return 0;