Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TV: add option to set TV connector type 

This can let user override non-stable driver TV load detect,
and set connector type manually, e.g for s-video to component
converter, this patch seems must needed to use HD modes.
This commit is contained in:
Zhenyu Wang 2009-03-03 20:26:19 +08:00
parent ab1ef05cc0
commit aa9da5e393
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/intel.man
View File

@ -278,6 +278,12 @@ Adjusting these properties allows you to control the placement of your TV output
.TP 2
This property allows you to control the output standard used on your TV output port. You can select between NTSC-M, NTSC-443, NTSC-J, PAL-M, PAL-N, and PAL.
.PP
.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.
.SS "TMDS-1"
First DVI SDVO output

31
src/i830_tv.c
View File

@ -56,6 +56,7 @@ enum tv_margin {
/** Private structure for the integrated TV support */
struct i830_tv_priv {
int type;
Bool force_type;
char *tv_format;
int margin[4];
uint32_t save_TV_H_CTL_1;
@ -1380,6 +1381,13 @@ 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;
@ -1743,6 +1751,7 @@ i830_tv_init(ScrnInfoPtr pScrn)
uint32_t tv_dac_on, tv_dac_off, save_tv_dac;
XF86OptionPtr mon_option_lst = NULL;
char *tv_format = NULL;
char *tv_type = NULL;
if (pI830->quirk_flag & QUIRK_IGNORE_TV)
return;
@ -1810,12 +1819,32 @@ i830_tv_init(ScrnInfoPtr pScrn)
dev_priv->margin[TV_MARGIN_BOTTOM] = xf86SetIntOption (mon_option_lst,
"Bottom", 37);
tv_format = xf86findOptionValue (mon_option_lst, "TV Format");
tv_format = xf86findOptionValue (mon_option_lst, "TV_Format");
if (tv_format)
dev_priv->tv_format = xstrdup (tv_format);
else
dev_priv->tv_format = xstrdup (tv_modes[0].name);
tv_type = xf86findOptionValue (mon_option_lst, "TV_Connector");
if (tv_type) {
dev_priv->force_type = TRUE;
if (strcasecmp(tv_type, "S-Video") == 0)
dev_priv->type = TV_TYPE_SVIDEO;
else if (strcasecmp(tv_type, "Composite") == 0)
dev_priv->type = TV_TYPE_COMPOSITE;
else if (strcasecmp(tv_type, "Component") == 0)
dev_priv->type = TV_TYPE_COMPONENT;
else {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Unknown TV Connector type %s\n", tv_type);
dev_priv->force_type = FALSE;
}
}
if (dev_priv->force_type)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Force TV Connector type as %s\n", tv_type);
output->driver_private = intel_output;
output->interlaceAllowed = FALSE;
output->doubleScanAllowed = FALSE;