diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-12-06 14:22:03 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-12-06 14:22:03 +1000 |
| commit | dbe3d2608ecc9896db9c23b3a347b50748c51e13 (patch) | |
| tree | c1d8e2bc17cfc1f3e98975c1be51debcee7a1a83 /src/radeon_driver.c | |
| parent | 48e31cdaa0caa21573879af5b9267773fe89176a (diff) | |
| parent | 21ed435398e4a398dd8a0a5d7c1d4cc45e916332 (diff) | |
Merge branch 'master' into atombios-support
Conflicts:
src/radeon_output.c
Diffstat (limited to 'src/radeon_driver.c')
| -rw-r--r-- | src/radeon_driver.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index ba4c111..7a469ed 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 } }; @@ -1703,7 +1705,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; } } |