From patchwork Fri Jan 14 12:51:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 478221 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0ECpb8c016533 for ; Fri, 14 Jan 2011 12:51:59 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7DE19F5EE for ; Fri, 14 Jan 2011 04:51:36 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id D486C9E74C for ; Fri, 14 Jan 2011 04:51:19 -0800 (PST) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 14 Jan 2011 04:51:19 -0800 Message-Id: <849307$b585ru@azsmga001.ch.intel.com> X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.60,322,1291622400"; d="scan'208";a="374609790" Received: from unknown (HELO cwilso3-mobl.ger.corp.intel.com) ([10.255.16.79]) by azsmga001.ch.intel.com with SMTP; 14 Jan 2011 04:51:14 -0800 Received: by cwilso3-mobl.ger.corp.intel.com (sSMTP sendmail emulation); Fri, 14 Jan 2011 12:51:13 +0000 Date: Fri, 14 Jan 2011 12:51:13 +0000 To: Christoph Lukas , intel-gfx@lists.freedesktop.org In-Reply-To: <1295008688.2327.43.camel@hoss.staad.pingworks.net> References: <1295008688.2327.43.camel@hoss.staad.pingworks.net> From: Chris Wilson Subject: Re: [Intel-gfx] External display X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 14 Jan 2011 12:59:13 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds index 9795eb5..45b1fe4 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -474,11 +474,9 @@ intel_lvds_detect(struct drm_connector *connector, bool for struct drm_device *dev = connector->dev; enum drm_connector_status status = connector_status_connected; - /* ACPI lid methods were generally unreliable in this generation, so - * don't even bother. - */ - if (IS_GEN2(dev) || IS_GEN3(dev)) - return connector_status_connected; + /* ACPI lid methods were generally unreliable, so don't even bother. */ + if (INTEL_INFO(dev)->gen >= 5 && !acpi_lid_open()) + status = connector_status_disconnected; return status; }