From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754620Ab0DTMu4 (ORCPT ); Tue, 20 Apr 2010 08:50:56 -0400 Received: from cantor.suse.de ([195.135.220.2]:46680 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754551Ab0DTMuz (ORCPT ); Tue, 20 Apr 2010 08:50:55 -0400 Date: Tue, 20 Apr 2010 14:50:54 +0200 Message-ID: From: Takashi Iwai To: Eric Anholt Cc: David Airlie , Jesse Barnes , dri-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org 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") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A new HP laptop with GM45 seems detecting wrongly TV outputs occasionally. Most of time it detects the TV output as disconnected, but spontaneously it detects NTSC 480i although the laptop has no TV output at all. A simple (but ad hoc) fix is to add a DMI check as below. Signed-off-by: Takashi Iwai --- drivers/gpu/drm/i915/intel_tv.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) 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 -- 1.7.0.4