[PATCH] drm/i915: Sync the hotplug work when device suspending

[Chuansheng Liu]

It is possible that during i915 device suspending with one pending
hotplug work, one of cases is the device resume/suspend quickly.

At this case, the hotplug work will be executed even after device
is OFF, in Intel Android platform, it will cause system hang.

Here we need sync the hotplug work in function i915_drm_freeze().

Signed-off-by: Liu, Chuansheng <chuansheng.liu at intel.com>
Signed-off-by: Li Fei <fei.li at intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 45b3c03..95c6956 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -562,6 +562,8 @@ static int i915_drm_freeze(struct drm_device *dev)
 
 		drm_irq_uninstall(dev);
 		dev_priv->enable_hotplug_processing = false;
+		cancel_work_sync(&dev_priv->hotplug_work);
+
 		/*
 		 * Disable CRTCs directly since we want to preserve sw state
 		 * for _thaw.
-- 
1.7.9.5