xf86-video-intel: 4 commits - configure.ac src/i830_debug.c src/i830_tv.c src/Makefile.am

[Eric Anholt]

 configure.ac     |    2 +-
 src/Makefile.am  |    4 ++--
 src/i830_debug.c |    2 --
 src/i830_tv.c    |    1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 62a037b0585d6ecb43daac9d4eb0927a4618a367
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jul 18 14:50:08 2008 -0700

    Fix distcheck.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e4ad28..594416d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,7 +139,6 @@ INTEL_G4A =				\
 	exa_wm_src_sample_argb.g4a 	\
 	exa_wm_src_sample_a.g4a 	\
 	exa_wm_src_sample_planar.g4a 	\
-	exa_wm_src_data.g4a		\
 	exa_wm_mask_affine.g4a 		\
 	exa_wm_mask_projective.g4a 	\
 	exa_wm_mask_sample_argb.g4a 	\
@@ -148,6 +147,7 @@ INTEL_G4A =				\
 	exa_wm_ca.g4a			\
 	exa_wm_ca_srcalpha.g4a		\
 	exa_wm_write.g4a 		\
+	exa_wm_yuv_rgb.g4a		\
 	exa_wm_xy.g4a
 
 INTEL_G4I =				\
@@ -166,7 +166,6 @@ INTEL_G4B = 				\
 	exa_wm_src_sample_argb.g4b 	\
 	exa_wm_src_sample_a.g4b 	\
 	exa_wm_src_sample_planar.g4b 	\
-	exa_wm_src_data.g4b		\
 	exa_wm_mask_affine.g4b 		\
 	exa_wm_mask_projective.g4b 	\
 	exa_wm_mask_sample_argb.g4b 	\
@@ -175,6 +174,7 @@ INTEL_G4B = 				\
 	exa_wm_ca.g4b			\
 	exa_wm_ca_srcalpha.g4b		\
 	exa_wm_write.g4b 		\
+	exa_wm_yuv_rgb.g4b		\
 	exa_wm_xy.g4b
 	
 EXTRA_DIST = 		\
commit 3cbfc6c76bcd2bc9194a944092f6ce0881ff9da2
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jul 18 14:56:18 2008 -0700

    Fix uninitialized-use warning in i830_debug.c ring dumping.

diff --git a/src/i830_debug.c b/src/i830_debug.c
index 7930346..a7f1683 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -1314,8 +1314,6 @@ i830_valid_command (uint32_t cmd)
 	if (!mi_cmds[opcode])
 	    return -1;
 	break;
-    case 1:
-	break;
     case 2:			    /* 2D */
 	count = (cmd & 0x1f) + 2;
 	opcode = (cmd >> 22) & 0x7f;
commit 1b1c4975768f63ed0f3933ec384d24c324a383b3
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jul 18 14:53:26 2008 -0700

    Get prototype for i830_bios_get_tv().

diff --git a/src/i830_tv.c b/src/i830_tv.c
index 651f77b..1022c46 100644
--- a/src/i830_tv.c
+++ b/src/i830_tv.c
@@ -36,6 +36,7 @@
 #include "xf86.h"
 #include "i830.h"
 #include "i830_display.h"
+#include "i830_bios.h"
 #include "X11/Xatom.h"
 #include <string.h>
 
commit 978abf84e8cf3ba3e915774981fe03610e15efeb
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jul 18 14:50:42 2008 -0700

    Bump version number past the 2.4 stable branch.

diff --git a/configure.ac b/configure.ac
index 2dabd4f..276fc1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.2.0,
+        2.4.99.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)