diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-01-22 04:50:57 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-01-22 04:50:57 +0000 |
| commit | 47bd9827d6243e28c65efb665efe2fbc7950d389 (patch) | |
| tree | 8aa474d83c9f7476da743e11f98ce862e7da6c60 /sys/dev | |
| parent | Handle the case where a chunk is in a rebuild state during writes. (diff) | |
| download | wireguard-openbsd-47bd9827d6243e28c65efb665efe2fbc7950d389.tar.xz wireguard-openbsd-47bd9827d6243e28c65efb665efe2fbc7950d389.zip | |
bring inteldrm back up after resume using DVACT_WAKEUP (non-cold, able
to tsleep, etc) rather than DVACT_RESUME (cold, interrupts disabled,
super restrictive)
tested by jcs and myself, investigated with kettenis
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index c1185bf6d48..d5dced59ac3 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.55 2013/12/06 11:17:20 kettenis Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.56 2014/01/22 04:50:57 deraadt Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -1126,7 +1126,7 @@ inteldrm_activate(struct device *arg, int act) break; case DVACT_SUSPEND: break; - case DVACT_RESUME: + case DVACT_WAKEUP: i915_drm_thaw(dev); intel_fb_restore_mode(dev); break; |