From patchwork Tue Apr 20 12:50:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 93661 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3KDKagx001735 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 20 Apr 2010 13:21:23 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1O4DLx-00041G-Nq; Tue, 20 Apr 2010 13:19:01 +0000 Received: from sfi-mx-1.v28.ch3.sourceforge.com ([172.29.28.121] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1O4Cus-0002Iz-Ro for dri-devel@lists.sourceforge.net; Tue, 20 Apr 2010 12:51:02 +0000 X-ACL-Warn: Received: from cantor.suse.de ([195.135.220.2] helo=mx1.suse.de) by sfi-mx-1.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1O4Cuq-0007Kc-Tx for dri-devel@lists.sourceforge.net; Tue, 20 Apr 2010 12:51:02 +0000 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 961E590847; Tue, 20 Apr 2010 14:50:54 +0200 (CEST) Date: Tue, 20 Apr 2010 14:50:54 +0200 Message-ID: From: Takashi Iwai To: Eric Anholt Subject: [PATCH] i915: Skip wrong TV outputs on HP laptop User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") X-Spam-Score: -0.4 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.4 AWL AWL: From: address is in the auto white-list X-Headers-End: 1O4Cuq-0007Kc-Tx X-Mailman-Approved-At: Tue, 20 Apr 2010 13:19:00 +0000 Cc: David Airlie , dri-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Jesse Barnes X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Apr 2010 13:21:31 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 552ec11..e848a28 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -37,6 +37,7 @@ #include "intel_drv.h" #include "i915_drm.h" #include "i915_drv.h" +#include enum tv_margin { TV_MARGIN_LEFT, TV_MARGIN_TOP, @@ -1735,6 +1736,18 @@ static int tv_is_present_in_vbt(struct drm_device *dev) return ret; } +static struct dmi_system_id intel_bad_tv[] = { + { + .ident = "HP Compaq 420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP 420"), + }, + }, + + { } /* terminating entry */ +}; + void intel_tv_init(struct drm_device *dev) { @@ -1757,6 +1770,10 @@ intel_tv_init(struct drm_device *dev) if (!dev_priv->int_tv_support) return; + /* wrongly detected TV outputs */ + if (dmi_check_system(intel_bad_tv)) + return; + /* * Sanity check the TV output by checking to see if the * DAC register holds a value