diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-09-20 14:25:15 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-09-20 14:25:15 +0000 |
| commit | 808f4aee212e1f5659a0ec97351360a7218e5b38 (patch) | |
| tree | c920dc8a95f8a604594707450410be049ce426bf /sys/dev | |
| parent | 060ebc4b9b443f3211bea13029632350ecd40296 (diff) | |
The BIOS on the x220 doesn't retrain the FDI link upon resume and restoring
the modeset registers in that state hangs the machine halfway through resume.
So skip this step on sandybrige and rely on the (upcoming) xf86-video-intel
driver to properly restore the mode.
ok oga@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915_drv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c index 01a42aa11a7..84ba5c5219d 100644 --- a/sys/dev/pci/drm/i915_drv.c +++ b/sys/dev/pci/drm/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.116 2011/09/14 10:26:16 oga Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.117 2011/09/20 14:25:14 kettenis Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -5465,6 +5465,10 @@ i915_restore_modeset_reg(struct inteldrm_softc *dev_priv) bus_size_t dpll_a_reg, fpa0_reg, fpa1_reg; bus_size_t dpll_b_reg, fpb0_reg, fpb1_reg; + /* XXX until we have FDI link training */ + if (IS_GEN6(dev_priv)) + return; + if (HAS_PCH_SPLIT(dev_priv)) { dpll_a_reg = PCH_DPLL_A; dpll_b_reg = PCH_DPLL_B; |