Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-16 16:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: don't suspend gt until after we disable irqs and display (v2)

Browse Source 
When I moved the irq disable down to after display disable,
I didn't realise the gt suspend also required irqs off, so move it
down as well.

Fixes WARNs seen at suspend/resume time.

v2: moved the rps flush down as well.

Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2014-07-23 14:25:24 +10:00
parent 78660d5fb0
commit 09b64267c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/i915_drv.c
View File

@ -516,11 +516,6 @@ static int i915_drm_freeze(struct drm_device *dev)
return error;
}
flush_delayed_work(&dev_priv->rps.delayed_resume_work);
intel_suspend_gt_powersave(dev);
/*
* Disable CRTCs directly since we want to preserve sw state
* for _thaw.
@ -532,8 +527,13 @@ static int i915_drm_freeze(struct drm_device *dev)
drm_modeset_unlock_all(dev);
intel_dp_mst_suspend(dev);
flush_delayed_work(&dev_priv->rps.delayed_resume_work);
intel_runtime_pm_disable_interrupts(dev);
intel_suspend_gt_powersave(dev);
intel_modeset_suspend_hw(dev);
}