diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-03-16 03:34:33 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-03-16 03:34:33 +0000 |
| commit | e7e6d26c2e592d28a46584a143dea16dff23276c (patch) | |
| tree | 97df63c1401f3dca61341dac478fa1d690d83926 /sys/dev/pci/drm/i915/i915_drv.c | |
| parent | 2f8f0ed13c02f87ad2999aa20bd5b4429330e93e (diff) | |
drm/i915: Do not clobber config status after a forced restore of hw state
From Chris Wilson
790dddadff219165a4666def708c16e8db2c5a7d in ubuntu 3.8
edd5b13313551d6b04acfb90d3db58ed3cf3c814 in mainline linux
Diffstat (limited to 'sys/dev/pci/drm/i915/i915_drv.c')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index 5ec94840747..ab8089e5dea 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.64 2014/03/13 12:45:04 kettenis Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.65 2014/03/16 03:34:32 jsg Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -554,6 +554,7 @@ __i915_drm_thaw(struct drm_device *dev) DRM_UNLOCK(); intel_modeset_init_hw(dev); + drm_mode_config_reset(dev); intel_modeset_setup_hw_state(dev, false); drm_irq_install(dev); } |