diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2011-04-21 16:08:14 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-09 09:13:22 -0700 |
| commit | 2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c (patch) | |
| tree | 4a1884e1fb0b26f43898ca16a71f5b757d932c1d /drivers | |
| parent | 39adb7a542db08998b4ae88f1698c4300dc39b55 (diff) | |
| download | linux-3.10-2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c.tar.gz linux-3.10-2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c.tar.bz2 linux-3.10-2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c.zip | |
drm/i915/lvds: Only act on lid notify when the device is on
If we're using vga switcheroo, the device may be turned off
and poking it can return random state. This provokes an OOPS fixed
separately by 8ff887c847 (drm/i915/dp: Be paranoid in case we disable a
DP before it is attached). Trying to use and respond to events on a
device that has been turned off by the user is in principle a silly thing
to do.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index a562bd2648c..67cb076d271 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -539,6 +539,9 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, struct drm_device *dev = dev_priv->dev; struct drm_connector *connector = dev_priv->int_lvds_connector; + if (dev->switch_power_state != DRM_SWITCH_POWER_ON) + return NOTIFY_OK; + /* * check and update the status of LVDS connector after receiving * the LID nofication event. |