summaryrefslogtreecommitdiff
path: root/sys/dev/pci/vga_pci.c
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2011-04-14 21:02:21 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2011-04-14 21:02:21 +0000
commit7158b82efb0c65d611c29eeed8e08ba875354720 (patch)
tree4a59527ddeed1b890295413c56dfad6aa2715c1d /sys/dev/pci/vga_pci.c
parente369dc5ef83fad9aeca02d43c10105cf6497d155 (diff)
For the time being repost Intel clarkdale IGD.
Arrandale (on laptop i3 and i5) was already doing this, but Clarkdale (the desktop chipsets) wasn't. This gives mikeb@'s desktop a chance to get the video back on resume. While here, remove the vendor/subvendor ids from the Arrandale entry. Just because someone doesn't have the same laptops as tested doesn't mean inteldrm magically has the ability to restore the graphics chip. This is possible to do without repost but fiddly and will take me a while to sort out, so just repost the whole sodding lot for now. ok ketteis@, deraadt@, mikeb@
Diffstat (limited to 'sys/dev/pci/vga_pci.c')
-rw-r--r--sys/dev/pci/vga_pci.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 3864adf493e..3cc69780d2e 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_pci.c,v 1.65 2010/12/26 15:41:00 miod Exp $ */
+/* $OpenBSD: vga_pci.c,v 1.66 2011/04/14 21:02:20 oga Exp $ */
/* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */
/*
@@ -180,15 +180,16 @@ static const struct vga_device_description vga_devs[] = {
{ 0xffff, 0xffff, 0x0000, 0x0000 }, 1, 0
},
- { /* Thinkpad T510 (and similar models) */
+ { /* Anything with on-die intel graphics, for now */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ARRANDALE_IGD,
- 0x17aa, 0x215a },
- { 0xffff, 0xffff, 0xffff, 0xffff }, 1, 0
+ 0x0000, 0x0000 },
+ { 0xffff, 0xffff, 0x0000, 0x0000 }, 1, 0
},
- { /* HP G62 (and similar models) */
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ARRANDALE_IGD,
- 0x103c, 0x1425 },
- { 0xffff, 0xffff, 0xffff, 0xffff }, 1, 0
+
+ { /* Anything with on-die intel graphics, for now */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CLARKDALE_IGD,
+ 0x0000, 0x0000 },
+ { 0xffff, 0xffff, 0x0000, 0x0000 }, 1, 0
},
{ /* All ATI video until further notice */