summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-11-19 00:19:39 -0500
committerAlex Deucher <alex@botch2.(none)>2007-11-19 00:19:39 -0500
commitf3dd7f413b670eeb6b8639f6677d72050ad5fe04 (patch)
treef1c2c8a9f3f5b3ed00c20dfd62158b804b64d15b /src
parent94de0e22d7229ca71e18e1e849d8545d9ca7bafe (diff)
Don't detect TV out for now
Diffstat (limited to 'src')
-rw-r--r--src/radeon_output.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 310072ea..619b7e2d 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -644,12 +644,16 @@ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output)
if (radeon_output->MonType == MT_UNKNOWN) {
if (IS_AVIVO_VARIANT) {
- radeon_output->MonType = avivo_display_ddc_connected(pScrn, output);
- if (!radeon_output->MonType) {
- if (radeon_output->type == OUTPUT_LVDS)
- radeon_output->MonType = MT_LCD;
- if (!radeon_output->MonType)
- radeon_output->MonType = atombios_dac_detect(pScrn, output);
+ if (OUTPUT_IS_TV)
+ radeon_output->MonType = MT_NONE;
+ else {
+ radeon_output->MonType = avivo_display_ddc_connected(pScrn, output);
+ if (!radeon_output->MonType) {
+ if (radeon_output->type == OUTPUT_LVDS)
+ radeon_output->MonType = MT_LCD;
+ else
+ radeon_output->MonType = atombios_dac_detect(pScrn, output);
+ }
}
} else {
if (OUTPUT_IS_TV) {