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

[Alex Deucher]

 src/atombios_output.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit d5cb24075928690377fd2dfaa32abfebff9990df
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun Jan 4 21:04:52 2009 -0500

    ATOM: add format rev 2 for digitial command tables
    
    should fix bug 18911

diff --git a/src/atombios_output.c b/src/atombios_output.c
index c111d76..eb52f5c 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -298,6 +298,7 @@ atombios_output_digital_setup(xf86OutputPtr output, int device, DisplayModePtr m
     switch (major) {
     case 0:
     case 1:
+    case 2:
 	switch (minor) {
 	case 1:
 	    disp_data.ucMisc = 0;
commit 1813456af3def38c6f53103054976f3092491746
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun Jan 4 21:01:05 2009 -0500

    ATOM: fail on more tables with unhandled revisions

diff --git a/src/atombios_output.c b/src/atombios_output.c
index 3030a10..c111d76 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -356,8 +356,14 @@ atombios_output_digital_setup(xf86OutputPtr output, int device, DisplayModePtr m
 	    }
 	    data.exec.pspace = &disp_data2;
 	    break;
+	default:
+	    ErrorF("Unknown table version\n");
+	    exit(-1);
 	}
 	break;
+    default:
+	ErrorF("Unknown table version\n");
+	exit(-1);
     }
 
     data.exec.index = index;
@@ -479,7 +485,7 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int device, DisplayM
     int major, minor;
 
     memset(&disp_data,0, sizeof(disp_data));
-    if (IS_DCE32_VARIANT) 
+    if (IS_DCE32_VARIANT)
 	index = GetIndexIntoMasterTable(COMMAND, UNIPHYTransmitterControl);
     else {
 	switch (device) {
@@ -874,7 +880,7 @@ atombios_set_output_crtc_source(xf86OutputPtr output)
     /*ErrorF("select crtc source table is %d %d\n", major, minor);*/
 
     switch(major) {
-    case 1: {
+    case 1:
 	switch(minor) {
 	case 0:
 	case 1:
@@ -959,9 +965,9 @@ atombios_set_output_crtc_source(xf86OutputPtr output)
 	    break;
 	}
 	break;
-    }
     default:
-	break;
+	ErrorF("Unknown table version\n");
+	exit(-1);
     }
 
     data.exec.index = index;