Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attach agp too.

This commit is contained in:
christos 2006-12-18 12:07:40 +00:00
parent f9a3a10e65
commit 8e5125c9ca
2 changed files with 70 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/amd64/conf/files.amd64
View File

@ -1,4 +1,4 @@
# $NetBSD: files.amd64,v 1.29 2006/09/10 19:50:48 plunky Exp $
# $NetBSD: files.amd64,v 1.30 2006/12/18 12:08:05 christos Exp $
#
# new style config file for amd64 architecture
#
@ -104,11 +104,13 @@ file arch/amd64/amd64/cpu.c cpu
include "dev/pci/files.pci"
defparam PCI_CONF_MODE
include "dev/pci/files.agp"
file arch/x86/pci/agp_machdep.c agp
# PCI-Host bridge chipsets
device pchb: pcibus
device pchb: pcibus, agpbus, agp_i810, agp_intel, agp_sis, agp_via, agp_amd, agp_ali
attach pchb at pci
file arch/amd64/pci/pchb.c pchb
file arch/amd64/pci/pchb.c pchb needs-flag
file arch/x86/pci/pchb_rnd.c pchb & rnd
# PCI-ISA bridges

69
sys/arch/amd64/pci/pchb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pchb.c,v 1.6 2006/02/12 18:16:01 tron Exp $ */
/* $NetBSD: pchb.c,v 1.7 2006/12/18 12:07:40 christos Exp $ */
/*-
* Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.6 2006/02/12 18:16:01 tron Exp $");
__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.7 2006/12/18 12:07:40 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -53,6 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.6 2006/02/12 18:16:01 tron Exp $");
#include <arch/x86/pci/pchbvar.h>
#include <dev/pci/agpreg.h>
#include <dev/pci/agpvar.h>
#include "rnd.h"
#define PCISET_BRIDGETYPE_MASK 0x3
@ -102,9 +105,17 @@ pchbattach(struct device *parent, struct device *self, void *aux)
#endif
struct pci_attach_args *pa = aux;
char devinfo[256];
struct pcibus_attach_args pba;
struct agpbus_attach_args apa;
u_char pbnum = 0; /* XXX: gcc */
int doattach, attachflags, has_agp;
printf("\n");
doattach = 0;
has_agp = 0;
attachflags = pa->pa_flags;
/*
* Print out a description, and configure certain chipsets which
* have auxiliary PCI buses.
@ -114,9 +125,33 @@ pchbattach(struct device *parent, struct device *self, void *aux)
printf("%s: %s (rev. 0x%02x)\n", self->dv_xname, devinfo,
PCI_REVISION(pa->pa_class));
switch (PCI_VENDOR(pa->pa_id)) {
/* Nothing yet */
default:
case PCI_VENDOR_INTEL:
switch (PCI_PRODUCT(pa->pa_id)) {
case PCI_PRODUCT_INTEL_82810_MCH:
case PCI_PRODUCT_INTEL_82810_DC100_MCH:
case PCI_PRODUCT_INTEL_82810E_MCH:
case PCI_PRODUCT_INTEL_82815_FULL_HUB:
case PCI_PRODUCT_INTEL_82830MP_IO_1:
case PCI_PRODUCT_INTEL_82845G_DRAM:
case PCI_PRODUCT_INTEL_82855GM_MCH:
case PCI_PRODUCT_INTEL_82865_HB:
case PCI_PRODUCT_INTEL_82915G_HB:
case PCI_PRODUCT_INTEL_82915GM_HB:
case PCI_PRODUCT_INTEL_82945P_MCH:
case PCI_PRODUCT_INTEL_82945GM_HB:
/*
* The host bridge is either in GFX mode (internal
* graphics) or in AGP mode. In GFX mode, we pretend
* to have AGP because the graphics memory access
* is very similar and the AGP GATT code will
* deal with this. In the latter case, the
* pci_get_capability(PCI_CAP_AGP) test below will
* fire, so we do no harm by already setting the flag.
*/
has_agp = 1;
break;
}
break;
}
#if NRND > 0
@ -125,4 +160,30 @@ pchbattach(struct device *parent, struct device *self, void *aux)
*/
pchb_attach_rnd(sc, pa);
#endif
/*
* If we haven't detected AGP yet (via a product ID),
* then check for AGP capability on the device.
*/
if (has_agp ||
pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP,
NULL, NULL) != 0) {
apa.apa_pci_args = *pa;
config_found_ia(self, "agpbus", &apa, agpbusprint);
}
if (doattach) {
pba.pba_iot = pa->pa_iot;
pba.pba_memt = pa->pa_memt;
pba.pba_dmat = pa->pa_dmat;
pba.pba_dmat64 = pa->pa_dmat64;
pba.pba_pc = pa->pa_pc;
pba.pba_flags = attachflags;
pba.pba_bus = pbnum;
pba.pba_bridgetag = NULL;
pba.pba_pc = pa->pa_pc;
pba.pba_intrswiz = 0;
memset(&pba.pba_intrtag, 0, sizeof(pba.pba_intrtag));
config_found_ia(self, "pcibus", &pba, pcibusprint);
}
}