Update to xf86-video-radeonhd 1.2.5. Tested by eric@

Version 1.2.5 improvements:

  - Added 2D acceleration for R6xx and R7xx.
  - Added XVideo support for R6xx and R7xx.
  - Added support for RS880 and RV790.
  - Added RandR 1.3 mandatory properties.
  - Refactoring of MC code.
  - Enable DRI support by default on R5xx and RS6xx.
  - LUT (color lookup table) fixes.
  - Tons of quirk table entries and bug fixes.
  - Fix register accesses for processors that reorder memory writes.

3 files changed, 38 insertions, 6 deletions

diff --git a/driver/xf86-video-radeonhd/utils/conntest/git_version.h b/driver/xf86-video-radeonhd/utils/conntest/git_version.h
index 84c71967c..03087ff3e 100644
--- a/driver/xf86-video-radeonhd/utils/conntest/git_version.h
+++ b/driver/xf86-video-radeonhd/utils/conntest/git_version.h
@@ -14,13 +14,13 @@
 
 /* git utilities found */
 #undef GIT_NOT_FOUND
-#define GIT_VERSION "git version 1.5.6"
+#define GIT_VERSION "git version 1.6.0.2"
 
 /* git repo found */
 #define GIT_REPO 1
 
 /* Git SHA ID of last commit */
-#define GIT_SHAID "4e897263"
+#define GIT_SHAID "cb54f48b"
 
 /* Branch this tree is on */
 #define GIT_BRANCH "master"
diff --git a/driver/xf86-video-radeonhd/utils/conntest/rhd_conntest.c b/driver/xf86-video-radeonhd/utils/conntest/rhd_conntest.c
index 07a13357d..9e9a595ce 100644
--- a/driver/xf86-video-radeonhd/utils/conntest/rhd_conntest.c
+++ b/driver/xf86-video-radeonhd/utils/conntest/rhd_conntest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, 2008  Luc Verhaegen <lverhaegen@novell.com>
+ * Copyright 2007, 2008  Luc Verhaegen <libv@exsuse.de>
  * Copyright 2007, 2008  Matthias Hopf <mhopf@novell.com>
  * Copyright 2007, 2008  Egbert Eich   <eich@novell.com>
  * Copyright 2007, 2008  Advanced Micro Devices, Inc.
diff --git a/driver/xf86-video-radeonhd/utils/conntest/rhd_dump.c b/driver/xf86-video-radeonhd/utils/conntest/rhd_dump.c
index 54c3e2395..7a3902660 100644
--- a/driver/xf86-video-radeonhd/utils/conntest/rhd_dump.c
+++ b/driver/xf86-video-radeonhd/utils/conntest/rhd_dump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, 2008  Luc Verhaegen <lverhaegen@novell.com>
+ * Copyright 2007, 2008  Luc Verhaegen <libv@exsuse.de>
  * Copyright 2007, 2008  Matthias Hopf <mhopf@novell.com>
  * Copyright 2007, 2008  Egbert Eich   <eich@novell.com>
  * Copyright 2007, 2008  Advanced Micro Devices, Inc.
@@ -363,7 +363,7 @@ print_help(const char* progname, const char* message, const char* msgarg)
 {
 	if (message != NULL)
 	    fprintf(stderr, "%s %s\n", message, msgarg);
-	fprintf(stderr, "Usage: %s [-r start,end | -w addr val] PCI-tag\n"
+	fprintf(stderr, "Usage: %s [-r start,end | -w addr val | -l {0|1}] PCI-tag\n"
 			"       PCI-tag: bus:dev.func\n\n",
 		progname);
 }
@@ -389,7 +389,8 @@ main(int argc, char *argv[])
     enum {
 	NONE,
 	READ,
-	WRITE
+	WRITE,
+	LUT
     } action = READ; /* default */
 
     int i;
@@ -451,6 +452,21 @@ main(int argc, char *argv[])
 		i--;
 		ret = 0;
 	    }
+	} else if (!strncmp("-l", argv[i], 3)) {
+	    action = LUT;
+
+	    if (++i < argc)
+		ret = sscanf(argv[i], "%d", &addr);
+	    else {
+		i--;
+		ret = 0;
+	    }
+	    
+	    if (addr > 1) ret = 0;
+	    if (ret != 1) {
+		print_help(argv[0], "Invalid LUT id:", argv[i]);
+		return 1;
+	    }
 	} else if (!strncmp("-",argv[i],1)) {
 	    print_help(argv[0], "Unknown option", argv[i]);
 	    return 1;
@@ -524,6 +540,22 @@ main(int argc, char *argv[])
 	val = RegRead(io, addr);
 	printf("New value: 0x%4.4X: 0x%8.8X\n",addr, val);
     }
+    else if (action == LUT) {
+	RegWrite(io, 0x6480, addr); /* lower half of LUT */
+	RegWrite(io, 0x6484, 0);    /* table mode */
+	RegWrite(io, 0x6488, 0);    /* start at 0 */
+
+	CARD32 r, g, b;
+
+	printf("Printing LUT %d\n", addr);
+	printf("     R   G   B\n");
+	for (j = 0; j < 256; j++) {
+	    r = RegRead(io, 0x648C) >> 6;
+	    g = RegRead(io, 0x648C) >> 6;
+	    b = RegRead(io, 0x648C) >> 6;
+	    printf("%02X: %3X %3X %3X\n", j, r, g, b);
+	}
+    }
 
     return 0;
 }