diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-05-15 10:24:37 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-05-15 10:24:37 +0000 |
| commit | fab41fc0fb718bce81831f4258462af2abc90062 (patch) | |
| tree | afdb20061e7f83eba912a0e37a452b417ed9b6b9 /sys/dev/pci | |
| parent | 16a0da393ab7806807666ee8bd5b6d650ebbc596 (diff) | |
sync the list of pre haswell intel video devices with linux
ok kettenis@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/agp_i810.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 18 |
2 files changed, 21 insertions, 4 deletions
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c index 2d19ed6f96b..76af84f37cc 100644 --- a/sys/dev/pci/agp_i810.c +++ b/sys/dev/pci/agp_i810.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_i810.c,v 1.76 2013/05/15 08:16:09 kettenis Exp $ */ +/* $OpenBSD: agp_i810.c,v 1.77 2013/05/15 10:24:36 jsg Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -149,6 +149,7 @@ agp_i810_get_chiptype(struct pci_attach_args *pa) case PCI_PRODUCT_INTEL_82845G_IGD: return (CHIP_I830); break; + case PCI_PRODUCT_INTEL_82854_IGD: case PCI_PRODUCT_INTEL_82855GM_IGD: case PCI_PRODUCT_INTEL_82865G_IGD: return (CHIP_I855); @@ -186,9 +187,12 @@ agp_i810_get_chiptype(struct pci_attach_args *pa) return (CHIP_G33); break; case PCI_PRODUCT_INTEL_82GM45_IGD_1: + case PCI_PRODUCT_INTEL_4SERIES_IGD: case PCI_PRODUCT_INTEL_82Q45_IGD_1: case PCI_PRODUCT_INTEL_82G45_IGD_1: case PCI_PRODUCT_INTEL_82G41_IGD_1: + case PCI_PRODUCT_INTEL_82B43_IGD_1: + case PCI_PRODUCT_INTEL_82B43_IGD_2: return (CHIP_G4X); break; case PCI_PRODUCT_INTEL_PINEVIEW_IGC_1: @@ -201,6 +205,7 @@ agp_i810_get_chiptype(struct pci_attach_args *pa) break; case PCI_PRODUCT_INTEL_CORE2G_GT1: case PCI_PRODUCT_INTEL_CORE2G_M_GT1: + case PCI_PRODUCT_INTEL_CORE2G_S_GT: case PCI_PRODUCT_INTEL_CORE2G_GT2: case PCI_PRODUCT_INTEL_CORE2G_M_GT2: case PCI_PRODUCT_INTEL_CORE2G_GT2_PLUS: diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index a33c0505ed5..8997675b44d 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.27 2013/05/05 13:55:36 kettenis Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.28 2013/05/15 10:24:36 jsg Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -314,6 +314,7 @@ static const struct intel_device_info intel_haswell_m_info = { const static struct drm_pcidev inteldrm_pciidlist[] = { {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830M_IGD, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G_IGD, 0 }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82854_IGD, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_IGD, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_IGD, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_IGD_1, 0 }, @@ -332,16 +333,19 @@ const static struct drm_pcidev inteldrm_pciidlist[] = { {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q35_IGD_1, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q33_IGD_1, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM45_IGD_1, 0 }, - {PCI_VENDOR_INTEL, 0x2E02, 0 }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_4SERIES_IGD, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_IGD_1, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G45_IGD_1, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G41_IGD_1, 0 }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82B43_IGD_1, 0 }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82B43_IGD_2, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PINEVIEW_IGC_1, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PINEVIEW_M_IGC_1, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CLARKDALE_IGD, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ARRANDALE_IGD, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_GT1, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_M_GT1, 0 }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_S_GT, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_GT2, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_M_GT2, 0 }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_GT2_PLUS, 0 }, @@ -364,6 +368,8 @@ static const struct intel_gfx_device_id { &intel_i830_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G_IGD, &intel_845g_info }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82854_IGD, + &intel_i85x_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_IGD, &intel_i85x_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_IGD, @@ -400,7 +406,7 @@ static const struct intel_gfx_device_id { &intel_g33_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM45_IGD_1, &intel_gm45_info }, - {PCI_VENDOR_INTEL, 0x2E02, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_4SERIES_IGD, &intel_g45_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_IGD_1, &intel_g45_info }, @@ -408,6 +414,10 @@ static const struct intel_gfx_device_id { &intel_g45_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G41_IGD_1, &intel_g45_info }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82B43_IGD_1, + &intel_g45_info }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82B43_IGD_2, + &intel_g45_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PINEVIEW_IGC_1, &intel_pineview_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PINEVIEW_M_IGC_1, @@ -420,6 +430,8 @@ static const struct intel_gfx_device_id { &intel_sandybridge_d_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_M_GT1, &intel_sandybridge_m_info }, + {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_S_GT, + &intel_sandybridge_d_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_GT2, &intel_sandybridge_d_info }, {PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_M_GT2, |