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

-fix botched switch/case nesting which made AGP on i810 in GFX mode fail

Browse Source 
-remove the check for i810's internal graphics completely: we'll attach
 AGP whether in GFX or AGP mode anyway, and the SMRAM register test
 was of questionable value (should have masked with 0xc0, but even then
 the builtin graphics appeared enabled although I used an external
 PCI card)
This commit is contained in:
drochner 2001-09-17 12:07:32 +00:00
parent f51bc9e68b
commit 8002eb91a6
1 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
sys/arch/i386/pci/pchb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pchb.c,v 1.27 2001/09/15 00:25:01 thorpej Exp $ */ /* $NetBSD: pchb.c,v 1.28 2001/09/17 12:07:32 drochner Exp $ */
/*- /*-
* Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@ -78,8 +78,6 @@
int pchbmatch __P((struct device *, struct cfdata *, void *)); int pchbmatch __P((struct device *, struct cfdata *, void *));
void pchbattach __P((struct device *, struct device *, void *)); void pchbattach __P((struct device *, struct device *, void *));
int pchb_i810_vgamatch(struct pci_attach_args *);
int pchb_print __P((void *, const char *)); int pchb_print __P((void *, const char *));
int agp_print __P((void *, const char *)); int agp_print __P((void *, const char *));
@ -250,31 +248,24 @@ pchbattach(struct device *parent, struct device *self, void *aux)
if (pbnum != 0) if (pbnum != 0)
doattach = 1; doattach = 1;
break; break;
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:
/*
* 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; break;
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:
{
struct pci_attach_args vga_pa;
pcireg_t ramreg;
/*
* XXXfvdl
* This relies on the "memory hub" and the VGA controller
* being on the same bus, which is kind of gross. Fortunately,
* we know this is always the case on the i810.
*/
if (pci_find_device(&vga_pa, pchb_i810_vgamatch) != 0) {
ramreg = pci_conf_read(pa->pa_pc, pa->pa_tag,
AGP_I810_SMRAM);
if (ramreg & 0xff)
has_agp = 1;
}
break;
}
} }
#if NRND > 0 #if NRND > 0
@ -308,25 +299,6 @@ pchbattach(struct device *parent, struct device *self, void *aux)
} }
} }
int
pchb_i810_vgamatch(struct pci_attach_args *pa)
{
if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY ||
PCI_SUBCLASS(pa->pa_class) != PCI_SUBCLASS_DISPLAY_VGA)
return (0);
switch (PCI_PRODUCT(pa->pa_id)) {
case PCI_PRODUCT_INTEL_82810_GC:
case PCI_PRODUCT_INTEL_82810_DC100_GC:
case PCI_PRODUCT_INTEL_82810E_GC:
case PCI_PRODUCT_INTEL_82815_FULL_GRAPH:
return (1);
}
return (0);
}
int int
pchb_print(void *aux, const char *pnp) pchb_print(void *aux, const char *pnp)
{ {