xf86-video-ati: Branch 'randr-1.2' - 2 commits

[Alex Deucher]

 src/radeon_bios.c   |    1 +
 src/radeon_output.c |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
diff-tree 08fe7ad00fba523775e95b5e6295fe23a5119d60 (from f56b90a60393ed187c0e39e149b2a3a32331ea52)
Author: Alex Deucher <alex at botch2.com>
Date:   Tue Aug 7 23:16:05 2007 -0400

    RADEON: fix ConnectorTable option after connector table re-work
    
    We may want to add the possiblity of more connectors to this option

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 7a26d43..440d39f 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1998,6 +1998,11 @@ Bool RADEONSetupConnectors(ScrnInfoPtr p
     optstr = (char *)xf86GetOptValString(info->Options, OPTION_CONNECTORTABLE);
 
     if (optstr) {
+	for (i = 2; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
+	    info->BiosConnector[i].valid = FALSE;
+	}
+	info->BiosConnector[0].valid = TRUE;
+	info->BiosConnector[1].valid = TRUE;
 	if (sscanf(optstr, "%u,%d,%d,%u,%u,%d,%d,%u",
 		   &info->BiosConnector[0].DDCType,
 		   &info->BiosConnector[0].DACType,
@@ -2012,7 +2017,7 @@ Bool RADEONSetupConnectors(ScrnInfoPtr p
 	}
     }
 
-    for (i = 0 ; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
+    for (i = 0; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
 	if (info->BiosConnector[i].valid) {
 	    if (info->IsAtomBios) {
 		if ((info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_D_ATOM) ||
diff-tree f56b90a60393ed187c0e39e149b2a3a32331ea52 (from a88a0e77eec514325b4d07bf7be9fb04e6f8e244)
Author: Alex Deucher <alex at botch2.com>
Date:   Tue Aug 7 23:08:02 2007 -0400

    RADEON: Make sure the default TV standard is supported

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 9e167b5..2d7f195 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -587,6 +587,7 @@ Bool RADEONGetTVInfoFromBIOS (xf86Output
 		else if (refclk == 3)
 		    radeon_output->TVRefClk = 27.000000000;
 
+		radeon_output->SupportedTVStds = radeon_output->default_tvStd;
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TV standards supported by chip: ");
 		stds = RADEON_BIOS8(offset + 10) & 0x1f;
 		if (stds & TV_STD_NTSC) {