[PATCH] drm/i915/lvds: Only act on lid notify when the device is on

From: Alex Williamson <alex.williamson@redhat.com>
To: chris@chris-wilson.co.uk
Cc: dri-devel@lists.freedesktop.org
Subject: [PATCH] drm/i915/lvds: Only act on lid notify when the device is on
Date: Thu, 21 Apr 2011 16:08:14 -0600	[thread overview]
Message-ID: <20110421220803.10321.68968.stgit@localhost6.localdomain6> (raw)

If we're using vga switcheroo, the device may be turned off
and poking at it can cause an oops.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---

 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 a562bd2..67cb076 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.
