summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-11-26 11:10:03 -0500
committerAlex Deucher <alex@botch2.(none)>2007-11-26 11:10:03 -0500
commitdcf22aed87366f4625fb5042cb84fecccd9ceece (patch)
tree9c0f480c2db674c1601ae63eb8a33a4f3902e0b3
parent206e280f02324641b4fe5a1986e26adf0e021fd4 (diff)
RADEON: only return status unknown for XPRESS chips
this seems to cause more issues than it attempted to fix so limit it to XPRESS chips for now.
-rw-r--r--src/radeon_output.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 54c27cd2..08c690c2 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1672,11 +1672,13 @@ radeon_detect(xf86OutputPtr output)
/* default to unknown for flaky chips/connectors
* so we can get something on the screen
*/
- if (((radeon_output->type == OUTPUT_VGA || radeon_output->type == OUTPUT_DVI) &&
- radeon_output->DACType == DAC_TVDAC)) {
+ if ((radeon_output->type == OUTPUT_VGA || radeon_output->type == OUTPUT_DVI) &&
+ (radeon_output->DACType == DAC_TVDAC) &&
+ (info->ChipFamily == CHIP_FAMILY_RS400)) {
radeon_output->MonType = MT_CRT;
return XF86OutputStatusUnknown;
- } else if (info->IsIGP && radeon_output->type == OUTPUT_DVI) {
+ } else if ((info->ChipFamily == CHIP_FAMILY_RS400) &&
+ radeon_output->type == OUTPUT_DVI) {
radeon_output->MonType = MT_DFP; /* MT_LCD ??? */
return XF86OutputStatusUnknown;
}