diff options
| -rw-r--r-- | man/radeon.man | 25 | ||||
| -rw-r--r-- | src/radeon.h | 4 | ||||
| -rw-r--r-- | src/radeon_driver.c | 4 | ||||
| -rw-r--r-- | src/radeon_output.c | 36 |
4 files changed, 63 insertions, 6 deletions
diff --git a/man/radeon.man b/man/radeon.man index 41c72429..881612a3 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -440,6 +440,31 @@ mini \-\- mini-external alias The default value is .B undefined. .TP +.BI "Option \*qTVStandard\*q \*q" string \*q +.br +Used to specify the default TV standard if you want to use something other than +the bios default. Valid options are: +.br +ntsc +.br +pal +.br +pal-m +.br +pal-60 +.br +ntsc-j +.br +scart-pal +.br +The default value is +.B undefined. +.TP +.BI "Option \*qForceTVOut\*q \*q" boolean \*q +Enable this option to force TV Out to always be detected as attached. +The default is +.B off +.TP .SH SEE ALSO __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) diff --git a/src/radeon.h b/src/radeon.h index f9bf3432..78f756e9 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -158,7 +158,9 @@ typedef enum { OPTION_MAC_MODEL, #endif OPTION_DEFAULT_TMDS_PLL, - OPTION_TVDAC_LOAD_DETECT + OPTION_TVDAC_LOAD_DETECT, + OPTION_FORCE_TVOUT, + OPTION_TVSTD } RADEONOpts; diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 04654974..3422b66e 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -192,6 +192,8 @@ static const OptionInfoRec RADEONOptions[] = { { OPTION_MAC_MODEL, "MacModel", OPTV_STRING, {0}, FALSE }, #endif { OPTION_TVDAC_LOAD_DETECT, "TVDACLoadDetect", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_FORCE_TVOUT, "ForceTVOut", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_TVSTD, "TVStandard", OPTV_STRING, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; @@ -1522,7 +1524,7 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn) info->IsIGP = card->igp; pRADEONEnt->HasCRTC2 = !card->nocrtc2; info->HasSingleDAC = card->singledac; - info->InternalTVOut = card->nointtvout; + info->InternalTVOut = !card->nointtvout; break; } } diff --git a/src/radeon_output.c b/src/radeon_output.c index efe093fc..4e5aded7 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -634,11 +634,18 @@ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output) if (radeon_output->MonType == MT_UNKNOWN) { if (radeon_output->type == OUTPUT_STV || radeon_output->type == OUTPUT_CTV) { - if (info->InternalTVOut) { - if (radeon_output->load_detection) - radeon_output->MonType = radeon_detect_tv(pScrn); + if (xf86ReturnOptValBool(info->Options, OPTION_FORCE_TVOUT, FALSE)) { + if (radeon_output->type == OUTPUT_STV) + radeon_output->MonType = MT_STV; else - radeon_output->MonType = MT_NONE; + radeon_output->MonType = MT_CTV; + } else { + if (info->InternalTVOut) { + if (radeon_output->load_detection) + radeon_output->MonType = radeon_detect_tv(pScrn); + else + radeon_output->MonType = MT_NONE; + } } } else { radeon_output->MonType = RADEONDisplayDDCConnected(pScrn, output); @@ -1759,6 +1766,7 @@ radeon_create_resources(xf86OutputPtr output) INT32 range[2]; int data, err; const char *s; + char *optstr; /* backlight control */ if (radeon_output->type == OUTPUT_LVDS) { @@ -1994,6 +2002,26 @@ radeon_create_resources(xf86OutputPtr output) s = "ntsc"; break; } + + optstr = (char *)xf86GetOptValString(info->Options, OPTION_TVSTD); + if (optstr) { + if (!strncmp("ntsc", optstr, strlen("ntsc"))) + radeon_output->tvStd = TV_STD_NTSC; + else if (!strncmp("pal", optstr, strlen("pal"))) + radeon_output->tvStd = TV_STD_PAL; + else if (!strncmp("pal-m", optstr, strlen("pal-m"))) + radeon_output->tvStd = TV_STD_PAL_M; + else if (!strncmp("pal-60", optstr, strlen("pal-60"))) + radeon_output->tvStd = TV_STD_PAL_60; + else if (!strncmp("ntsc-j", optstr, strlen("ntsc-j"))) + radeon_output->tvStd = TV_STD_NTSC_J; + else if (!strncmp("scart-pal", optstr, strlen("scart-pal"))) + radeon_output->tvStd = TV_STD_SCART_PAL; + else { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Invalid TV Standard: %s\n", optstr); + } + } + err = RRChangeOutputProperty(output->randr_output, tv_std_atom, XA_STRING, 8, PropModeReplace, strlen(s), (pointer)s, FALSE, FALSE); |