Skip to content

Commit

Permalink
drm/i915/lvds: Only act on lid notify when the device is on
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
awilliam authored and keith-packard committed May 9, 2011
1 parent 39adb7a commit 2fb4e61
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/intel_lvds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 2fb4e61

Please sign in to comment.