Commit 06891e27 authored by Jesse Barnes's avatar Jesse Barnes

drm/i915: fix suspend/resume breakage in lid notifier

We now unconditionally restore the mode at lid open time since some
platforms turn off the panel, pipes or other display elements when the
lid is closed.  There's a problem with doing this at resume time
however.

At resume time, we'll get a lid event, but restoring the mode at that
time may not be safe (e.g. if we get the lid event before global state
has been restored), so check the suspended state and make sure our
restore is locked against other mode updates.
Tested-by: default avatarBen Gamari <bgamari.foss@gmail.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ba1234d1
...@@ -89,6 +89,8 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state) ...@@ -89,6 +89,8 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
pci_set_power_state(dev->pdev, PCI_D3hot); pci_set_power_state(dev->pdev, PCI_D3hot);
} }
dev_priv->suspended = 1;
return 0; return 0;
} }
...@@ -124,6 +126,8 @@ static int i915_resume(struct drm_device *dev) ...@@ -124,6 +126,8 @@ static int i915_resume(struct drm_device *dev)
drm_helper_resume_force_mode(dev); drm_helper_resume_force_mode(dev);
} }
dev_priv->suspended = 0;
return ret; return ret;
} }
......
...@@ -253,6 +253,7 @@ typedef struct drm_i915_private { ...@@ -253,6 +253,7 @@ typedef struct drm_i915_private {
struct workqueue_struct *wq; struct workqueue_struct *wq;
/* Register state */ /* Register state */
bool suspended;
u8 saveLBB; u8 saveLBB;
u32 saveDSPACNTR; u32 saveDSPACNTR;
u32 saveDSPBCNTR; u32 saveDSPBCNTR;
......
...@@ -651,8 +651,11 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, ...@@ -651,8 +651,11 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
container_of(nb, struct drm_i915_private, lid_notifier); container_of(nb, struct drm_i915_private, lid_notifier);
struct drm_device *dev = dev_priv->dev; struct drm_device *dev = dev_priv->dev;
if (acpi_lid_open()) if (acpi_lid_open() && !dev_priv->suspended) {
mutex_lock(&dev->mode_config.mutex);
drm_helper_resume_force_mode(dev); drm_helper_resume_force_mode(dev);
mutex_unlock(&dev->mode_config.mutex);
}
drm_sysfs_hotplug_event(dev_priv->dev); drm_sysfs_hotplug_event(dev_priv->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment