summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-12-30 17:43:17 +1000
committerDave Airlie <airlied@linux.ie>2007-12-30 17:43:17 +1000
commita674f683e6699c30664d9cd468a64de991c3fd7e (patch)
treefc01137eeaaf3a50e5272775df1b22f4f3f9a356 /src
parentaa7c28cbd943bb525698515d444cb5097880e364 (diff)
atombios: enable TV-out detection code - tv out works for me with this
Diffstat (limited to 'src')
-rw-r--r--src/atombios_output.c3
-rw-r--r--src/radeon_output.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/atombios_output.c b/src/atombios_output.c
index f84afd09..45e56960 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -480,6 +480,9 @@ atombios_set_output_crtc_source(xf86OutputPtr output)
} else if (radeon_output->MonType == MT_LCD) {
if (radeon_output->devices & ATOM_DEVICE_LCD1_SUPPORT)
crtc_src_param.ucDevice = ATOM_DEVICE_LCD1_INDEX;
+ } else if (OUTPUT_IS_TV || (radeon_output->MonType == MT_CV)) {
+ if (radeon_output->devices & ATOM_DEVICE_TV1_SUPPORT)
+ crtc_src_param.ucDevice = ATOM_DEVICE_TV1_INDEX;
}
break;
}
diff --git a/src/radeon_output.c b/src/radeon_output.c
index c5f796b3..9efa0560 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -359,7 +359,7 @@ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output)
else
radeon_output->MonType = MT_CTV;
} else
- radeon_output->MonType = MT_NONE;
+ radeon_output->MonType = atombios_dac_detect(pScrn, output);
} else
radeon_output->MonType = atombios_dac_detect(pScrn, output);
}