TV: force TV as connected with TV_Connector option

In order to bypass failure in TV load detect, TV_Connector option
will always force TV as connected with user specified connector type.
This commit is contained in:
Zhenyu Wang 2009-03-16 09:30:22 +08:00
parent d9dbdb3255
commit 4e95327323
2 changed files with 5 additions and 8 deletions

View File

@ -313,7 +313,7 @@ This property allows you to control the output standard used on your TV output p
.B TV_Connector
- connector type
.TP 2
This config option should be added to xorg.conf TV monitor's section, it allows you to control the TV output connector type, which bypass load detect. You can select between S-Video, Composite and Component.
This config option should be added to xorg.conf TV monitor's section, it allows you to force the TV output connector type, which bypass load detect and TV will always be taken as connected. You can select between S-Video, Composite and Component.
.SS "TMDS-1"
First DVI SDVO output

View File

@ -1458,6 +1458,10 @@ i830_tv_detect(xf86OutputPtr output)
int dpms_mode;
int type = dev_priv->type;
/* If TV connector type set by user, always return connected */
if (dev_priv->force_type)
return XF86OutputStatusConnected;
mode = reported_modes[0];
xf86SetModeCrtc (&mode, INTERLACE_HALVE_V);
crtc = i830GetLoadDetectPipe (output, &mode, &dpms_mode);
@ -1467,13 +1471,6 @@ i830_tv_detect(xf86OutputPtr output)
i830ReleaseLoadDetectPipe (output, dpms_mode);
}
if (dev_priv->force_type) {
if (type == TV_TYPE_NONE)
return XF86OutputStatusDisconnected;
else
return XF86OutputStatusConnected;
}
if (type != dev_priv->type)
{
dev_priv->type = type;