xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 man/radeon.man      |    4 ++--
 src/radeon_output.c |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit dcf22aed87366f4625fb5042cb84fecccd9ceece
Author: Alex Deucher <alex at botch2.(none)>
Date:   Mon Nov 26 11:10:03 2007 -0500

    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.

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 54c27cd..08c690c 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;
 	  }
commit 206e280f02324641b4fe5a1986e26adf0e021fd4
Author: Alex Deucher <alex at botch2.(none)>
Date:   Mon Nov 26 09:39:27 2007 -0500

    RADEON: fix typo in man page

diff --git a/man/radeon.man b/man/radeon.man
index 5d31eb1..f302ade 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -383,14 +383,14 @@ case.  This is only useful for LVDS panels (laptop internal panels).
 The default is
 .B on.
 .TP
-.BI "Option \*TVDACLoadDetect\*q \*q" boolean \*q
+.BI "Option \*qTVDACLoadDetect\*q \*q" boolean \*q
 Enable load detection on the TV DAC.  The TV DAC is used to drive both 
 TV-OUT and analog monitors. Load detection is often unreliable in the 
 TV DAC so it is disabled by default.
 The default is
 .B off.
 .TP
-.BI "Option \*DefaultTMDSPLL\*q \*q" boolean \*q
+.BI "Option \*qDefaultTMDSPLL\*q \*q" boolean \*q
 Use the default driver provided TMDS PLL values rather than the ones
 provided by the bios. This option has no effect on Mac cards.  Enable 
 this option if you are having problems with a DVI monitor using the