summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@jbarnes-t61.(none)>2008-07-10 12:57:25 -0700
committerZhenyu Wang <zhenyu.z.wang@intel.com>2008-07-21 11:04:39 +0800
commit891a25c2f7b24668dff59940d0b989a5cd23478f (patch)
treeed2b5d04e408321822ba3dd6694fd2093155d574 /src
parente1ef5fc04907e02a38c518c868f39a897f81cd1e (diff)
Add VBIOS based TV connector detection
Now that the VBIOS code supports it, we can use the general features block to detect whether a TV connector is present on a given platform. Reviewed by Nanhai Zou. (cherry picked from commit 3c0f2bcc9965155fecab606edae68874427d3423)
Diffstat (limited to 'src')
-rw-r--r--src/i830_tv.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/i830_tv.c b/src/i830_tv.c
index cde929a7..651f77b3 100644
--- a/src/i830_tv.c
+++ b/src/i830_tv.c
@@ -1715,6 +1715,10 @@ i830_tv_init(ScrnInfoPtr pScrn)
(tv_dac_off & TVDAC_STATE_CHG_EN) != 0)
return;
+ i830_bios_get_tv(pScrn);
+ if (!pI830->tv_present) /* VBIOS claims no TV connector */
+ return;
+
output = xf86OutputCreate (pScrn, &i830_tv_output_funcs, "TV");
if (!output)