diff options
| author |   jsg <jsg@openbsd.org> | 2014-10-08 05:25:41 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2014-10-08 05:25:41 +0000 |
| commit | 4c613c5585a92b66a6520ffb1089823c419052fb (patch) | |
| tree | df5f18a1a0cac65a3039a707f34ebe2decf65a9c | |
| parent | obvious reallocarray() (diff) | |
| download | wireguard-openbsd-4c613c5585a92b66a6520ffb1089823c419052fb.tar.xz wireguard-openbsd-4c613c5585a92b66a6520ffb1089823c419052fb.zip | |
Remove the i830/i845 pipe A force quirks, matching changes
in recent versions of the linux drm code.
drm/i915: Nuke pipe A quirk on i830M
From Daniel Vetter
0e8abc81bf4b54a01bb026ba4d883de7c415cc03 in mainline linux
drm/i915: Undo the PIPEA quirk for i845
From Chris Wilson
a4945f9522d27e1e6d64a02ad055e83768cb0896 in mainline linux
With this change a hardware lockup with i845g reported by "THEvoid"
via bugs@ is avoided.
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_display.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/pci/drm/i915/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c index 5c5a4d9e94d..90f3fdb9731 100644 --- a/sys/dev/pci/drm/i915/intel_display.c +++ b/sys/dev/pci/drm/i915/intel_display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_display.c,v 1.36 2014/06/21 05:38:28 jsg Exp $ */ +/* $OpenBSD: intel_display.c,v 1.37 2014/10/08 05:25:41 jsg Exp $ */ /* * Copyright © 2006-2007 Intel Corporation * @@ -9016,10 +9016,6 @@ static struct intel_quirk intel_quirks[] = { /* ThinkPad T60 needs pipe A force quirk (bug #16494) */ { 0x2782, 0x17aa, 0x201a, quirk_pipea_force }, - /* 830/845 need to leave pipe A & dpll A up */ - { 0x2562, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, - { 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, - /* Lenovo U160 cannot use SSC on LVDS */ { 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable }, |