diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-03-16 09:30:22 +0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-03-16 14:23:42 -0700 |
| commit | 14e09995a74b296acda33bb6c833b432075cd873 (patch) | |
| tree | 349f6c531e6f69f45634adf78c7f13ff1a2a5c49 | |
| parent | 72ab5ee2e1b459772641f3b6e347ef9389f24195 (diff) | |
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.
(cherry picked from commit 4e95327323e3d081b565147f7738eb49c28542bc)
| -rw-r--r-- | man/intel.man | 2 | ||||
| -rw-r--r-- | src/i830_tv.c | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/man/intel.man b/man/intel.man index ee237f87..e6cb03eb 100644 --- a/man/intel.man +++ b/man/intel.man @@ -322,7 +322,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 diff --git a/src/i830_tv.c b/src/i830_tv.c index 1e3cf7b6..42d9e907 100644 --- a/src/i830_tv.c +++ b/src/i830_tv.c @@ -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; |