diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-09-28 06:47:24 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-09-28 06:47:24 +0000 |
| commit | 712c3952a420b97201a9d4f6c31bf5b211963ff8 (patch) | |
| tree | edeb217a5f4b784f8fbfd49e1b874962f83a2cc6 /sys/dev/pci/drm | |
| parent | 7e1de9a1ebe35ce98b3c10eef87b23aa1084d5a1 (diff) | |
Remove the "Quanta Transcode" device from the list of supported hardware.
It's only supposed to match certain subvendor/subdevice IDs, but our code
doesn't check those. The result is that it (incorrectly) overrides the
generic match for the HD Graphics P4000 as found on some Xeon E3 CPUs.
This device is supposedly a castrated version of that device with the
display output parts fused off. According to the original Linux commit
it is "some HW being used for a demo", and there have been proposals to
remove it from the Linux tree as well. It is unlikely that OpenBSD will
ever run on this particular hardware.
Diffstat (limited to 'sys/dev/pci/drm')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index e0d3ae49f0a..1f70e0a123a 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.91 2015/09/26 22:00:00 kettenis Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.92 2015/09/28 06:47:23 kettenis Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -211,16 +211,6 @@ int i915_load_modeset_init(struct drm_device *); .subdevice = PCI_ANY_ID, \ .driver_data = (unsigned long) info } -#undef INTEL_QUANTA_VGA_DEVICE -#define INTEL_QUANTA_VGA_DEVICE(info) { \ - .class = PCI_CLASS_DISPLAY << 16, \ - .class_mask = 0xff0000, \ - .vendor = 0x8086, \ - .device = 0x16a, \ - .subvendor = 0x152d, \ - .subdevice = 0x8990, \ - .driver_data = (unsigned long) info } - static const struct intel_device_info intel_i830_info = { .gen = 2, .is_mobile = 1, .cursor_needs_physical = 1, .num_pipes = 2, .has_overlay = 1, .overlay_needs_physical = 1, @@ -446,7 +436,6 @@ static const struct intel_device_info intel_broadwell_m_info = { INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info), \ INTEL_SNB_D_IDS(&intel_sandybridge_d_info), \ INTEL_SNB_M_IDS(&intel_sandybridge_m_info), \ - INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */ \ INTEL_IVB_M_IDS(&intel_ivybridge_m_info), \ INTEL_IVB_D_IDS(&intel_ivybridge_d_info), \ INTEL_HSW_D_IDS(&intel_haswell_d_info), \ |