diff options
| author | Jesse Barnes <jbarnes@jbarnes-t61.(none)> | 2008-05-09 14:19:39 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-05-09 14:19:39 -0700 |
| commit | 6ee0c09b0e2746022c25962cbfe655f2f1d5c53e (patch) | |
| tree | d1f40f9953bb1893853ee9aa7ee616fc7074a1f0 /linux-core | |
| parent | 12725a37af691345e74fe22d53300abec2581852 (diff) | |
i915: use BDB TV flag for TV detection
Even if the TV encoder hasn't been fused off, we may not have a TV connector on
the platform. The BDB in the BIOS should give us this info in some cases.
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/intel_tv.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux-core/intel_tv.c b/linux-core/intel_tv.c index 89bdda1c..ba134d62 100644 --- a/linux-core/intel_tv.c +++ b/linux-core/intel_tv.c @@ -1597,14 +1597,13 @@ intel_tv_init(struct drm_device *dev) char **tv_format_names; int i, initial_mode = 0; - /* FIXME: better TV detection and/or quirks */ -#if 0 - if (tv_priv->quirk_flag & QUIRK_IGNORE_TV) - return; -#endif if ((I915_READ(TV_CTL) & TV_FUSE_STATE_MASK) == TV_FUSE_STATE_DISABLED) return; + /* Even if we have an encoder we may not have a connector */ + if (!dev_priv->bdb->int_tv_support) + return; + /* * Sanity check the TV output by checking to see if the * DAC register holds a value |