diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-08-29 01:28:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-08-29 01:28:00 +0000 |
| commit | 80010d966b61c52ba3916dc4df1db9977f0e3b27 (patch) | |
| tree | e7131509111b3820278b3818c439e83949d15470 /sys | |
| parent | 50b8dfe608e02c89a45ae0b5a1274d805a497b7d (diff) | |
XXX when we find vgapci devices on a USIII machine, fail to match
(for now, until the bugs are found. USIII machines remain serial-only
for now); ok miod
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc64/dev/vgafb.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/sparc64/dev/vgafb.c b/sys/arch/sparc64/dev/vgafb.c index ca6c836a642..630c40999ab 100644 --- a/sys/arch/sparc64/dev/vgafb.c +++ b/sys/arch/sparc64/dev/vgafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb.c,v 1.46 2006/08/11 18:57:08 miod Exp $ */ +/* $OpenBSD: vgafb.c,v 1.47 2006/08/29 01:27:59 deraadt Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -125,8 +125,15 @@ vgafbmatch(parent, vcf, aux) return (1); if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY && - PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_DISPLAY_VGA) + PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_DISPLAY_VGA) { + extern char cpu_model[]; + + /* XXX Cannot yet deal with VGA devices on Blade 1000 and family */ + if (strncmp(cpu_model, "SUNW,UltraSPARC-III", + strlen("SUNW,UltraSPARC-III")) == 0) + return (0); return (1); + } if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY && PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_DISPLAY_MISC) |