[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <s5htyr6jnip.wl%tiwai@suse.de>
Date: Tue, 20 Apr 2010 14:50:54 +0200
From: Takashi Iwai <tiwai@...e.de>
To: Eric Anholt <eric@...olt.net>
Cc: David Airlie <airlied@...ux.ie>,
Jesse Barnes <jbarnes@...tuousgeek.org>,
dri-devel@...ts.sourceforge.net, linux-kernel@...r.kernel.org
Subject: [PATCH] i915: Skip wrong TV outputs on HP laptop
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 <tiwai@...e.de>
---
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 <linux/dmi.h>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists