6 files changed, 57 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/va/Makefile b/src/gallium/state_trackers/va/Makefile
index 1e22bb50d1d..dd303ebace9 100644
--- a/src/gallium/state_trackers/va/Makefile
+++ b/src/gallium/state_trackers/va/Makefile
@@ -19,7 +19,8 @@ C_SOURCES = htab.c \
 	    va_buffer.c \
 	    va_config.c \
             va_picture.c \
-            va_surface.c
+            va_surface.c \
+	    va_display.c
 	    
 
 
diff --git a/src/gallium/state_trackers/va/va_config.c b/src/gallium/state_trackers/va/va_config.c
index 5756c2f155d..591d113a916 100644
--- a/src/gallium/state_trackers/va/va_config.c
+++ b/src/gallium/state_trackers/va/va_config.c
@@ -29,7 +29,7 @@
 #include <va/va_backend.h>
 #include "va_private.h"
 
-VAStatus vlVaConfigProfiles(       VADriverContextP ctx,
+VAStatus vlVaQueryConfigProfiles(       VADriverContextP ctx,
                                    VAProfile *profile_list,
                                    int *num_profiles)
 {
@@ -40,7 +40,7 @@ VAStatus vlVaConfigProfiles(       VADriverContextP ctx,
 }
 
 
-VAStatus vlVaConfigEntrypoints(       VADriverContextP ctx,
+VAStatus vlVaQueryConfigEntrypoints(       VADriverContextP ctx,
                                       VAProfile profile,
                                       VAEntrypoint *entypoint_list,
                                       int *num_entrypoints)
@@ -98,3 +98,4 @@ VAStatus vlVaQueryConfigAttributes(       VADriverContextP ctx,
 
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
+
diff --git a/src/gallium/state_trackers/va/va_context.c b/src/gallium/state_trackers/va/va_context.c
index 7ef84606305..1e3ab9cb22e 100644
--- a/src/gallium/state_trackers/va/va_context.c
+++ b/src/gallium/state_trackers/va/va_context.c
@@ -84,6 +84,5 @@ VAStatus vlVaTerminate(       VADriverContextP ctx)
 {
 	if (!ctx)
 		return VA_STATUS_ERROR_INVALID_CONTEXT;
-
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
diff --git a/src/gallium/state_trackers/va/va_image.c b/src/gallium/state_trackers/va/va_image.c
index b1f990a15eb..40a96d3ea48 100644
--- a/src/gallium/state_trackers/va/va_image.c
+++ b/src/gallium/state_trackers/va/va_image.c
@@ -66,7 +66,7 @@ VAStatus vlVaDeriveImage(	VADriverContextP ctx,
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus vlDestroyImage(	VADriverContextP ctx,
+VAStatus vlVaDestroyImage(	VADriverContextP ctx,
                             VAImageID image)
 {
 	if (!ctx)
@@ -76,7 +76,7 @@ VAStatus vlDestroyImage(	VADriverContextP ctx,
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus vlSetImagePalette(	VADriverContextP ctx,
+VAStatus vlVaSetImagePalette(	VADriverContextP ctx,
                             VAImageID image,
                             unsigned char *palette)
 {
diff --git a/src/gallium/targets/va-r600/Makefile b/src/gallium/targets/va-r600/Makefile
new file mode 100644
index 00000000000..03ca8edaf25
--- /dev/null
+++ b/src/gallium/targets/va-r600/Makefile
@@ -0,0 +1,26 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBBASENAME = r600_drv_video
+
+DRIVER_DEFINES = -DGALLIUM_SOFTPIPE
+DRIVER_INCLUDES =
+
+PIPE_DRIVERS = \
+	$(TOP)/src/gallium/drivers/r600/libr600.a \
+	$(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
+        $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \
+	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+        $(TOP)/src/gallium/drivers/trace/libtrace.a \
+	$(TOP)/src/gallium/auxiliary/libgallium.a
+
+C_SOURCES = \
+	target.c \
+	$(COMMON_GALLIUM_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_LIBS = $(shell pkg-config libdrm_radeon --libs) -lXfixes
+
+include ../Makefile.va
+
+symlinks:
diff --git a/src/gallium/targets/va-r600/target.c b/src/gallium/targets/va-r600/target.c
new file mode 100644
index 00000000000..8753e2bab17
--- /dev/null
+++ b/src/gallium/targets/va-r600/target.c
@@ -0,0 +1,24 @@
+#include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
+#include "r600/drm/r600_drm_public.h"
+#include "r600/r600_public.h"
+
+static struct pipe_screen *create_screen(int fd)
+{
+   struct radeon *radeon;
+   struct pipe_screen *screen;
+
+   radeon = r600_drm_winsys_create(fd);
+   if (!radeon)
+      return NULL;
+
+   screen = r600_screen_create(radeon);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen)