From: Eric Anholt <eric@anholt.net>
Date: Fri, 2 Jan 2009 23:57:35 +0000 (-0800)
Subject: drm/i915: Non-mobile parts don't have integrated TV-out.
X-Git-Tag: v2.6.29-rc1~220^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1fc45d84d616cec00566152c1080903c461eb537;p=linux-2.6-omap-h63xx.git

drm/i915: Non-mobile parts don't have integrated TV-out.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 67d06fd29d8..8ccb9c3ab86 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1456,7 +1456,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 	} else
 		intel_dvo_init(dev);
 
-	if (IS_I9XX(dev) && !IS_I915G(dev))
+	if (IS_I9XX(dev) && IS_MOBILE(dev))
 		intel_tv_init(dev);
 
 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {