From patchwork Tue Feb 9 12:54:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 78016 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o19DAb4T011097 for ; Tue, 9 Feb 2010 13:11:13 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B3B89EB1B; Tue, 9 Feb 2010 05:10:37 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 09 Feb 2010 13:11:13 +0000 (UTC) X-Greylist: delayed 969 seconds by postgrey-1.30 at gabe; Tue, 09 Feb 2010 05:10:34 PST Received: from fireflyinternet.com (smtp.fireflyinternet.com [94.30.43.99]) by gabe.freedesktop.org (Postfix) with ESMTP id 925C99E9E8 for ; Tue, 9 Feb 2010 05:10:33 -0800 (PST) Received: from localhost.localdomain (unverified [78.156.66.37]) by fireflyinternet.com (Firefly Internet SMTP) with ESMTP id 76905659-1948518 for multiple; Tue, 09 Feb 2010 12:54:17 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 9 Feb 2010 12:54:17 +0000 Message-Id: <1265720057-14592-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.6.6.1 X-Originating-IP: 78.156.66.37 Subject: [Intel-gfx] [PATCH] drm/i915: Override disabling LVDS on lid closure X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 1150364..babd553 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -45,6 +45,9 @@ module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400); unsigned int i915_powersave = 1; module_param_named(powersave, i915_powersave, int, 0400); +unsigned int i915_lvds_use_lid = 1; +module_param_named(lvds_use_lid, i915_lvds_use_lid, int, 0400); + unsigned int i915_lvds_downclock = 0; module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 8f0fc9b..5d90c91 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -755,6 +755,7 @@ extern struct drm_ioctl_desc i915_ioctls[]; extern int i915_max_ioctl; extern unsigned int i915_fbpercrtc; extern unsigned int i915_powersave; +extern unsigned int i915_lvds_use_lid; extern unsigned int i915_lvds_downclock; extern void i915_save_display(struct drm_device *dev); diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index ac35659..64b603b 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -643,7 +643,9 @@ static enum drm_connector_status intel_lvds_detect(struct drm_connector *connect { enum drm_connector_status status = connector_status_connected; - if (!dmi_check_system(bad_lid_status) && !acpi_lid_open()) + if (i915_lvds_use_lid && + !dmi_check_system(bad_lid_status) && + !acpi_lid_open()) status = connector_status_disconnected; return status;