diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-07 10:15:44 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-07 10:15:44 +0200 |
| commit | cfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb (patch) | |
| tree | 06240ac00c9fee6a9ca97b778c63bfaa7ab6904d /drivers/gpu/drm/i915/i915_drv.c | |
| parent | 34882298b93e998d5fccde852b860e8fbe6c8f6b (diff) | |
| parent | 57127efaf1adc5e0bb2d3fa5a01bd97f71af7836 (diff) | |
Merge patches merged by Jani while I was on vacation.
Jani apparently didn't rebase onto latest drm-intel-next so a merge is
in order.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6eb45ac7a7d..8a0cb0cc39a 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -520,6 +520,8 @@ static int i915_drm_freeze(struct drm_device *dev) return error; } + flush_delayed_work(&dev_priv->rps.delayed_resume_work); + intel_runtime_pm_disable_interrupts(dev); dev_priv->enable_hotplug_processing = false; |