Merge remote branch 'nouveau/gallium-0.1' into gallium-0.2

24 files changed, 205 insertions, 109 deletions

diff --git a/src/gallium/winsys/drm/nouveau/nv04_surface.c b/src/gallium/winsys/drm/nouveau/nv04_surface.c
index 8fa3d106c8c..5bf89e1952e 100644
--- a/src/gallium/winsys/drm/nouveau/nv04_surface.c
+++ b/src/gallium/winsys/drm/nouveau/nv04_surface.c
@@ -3,6 +3,32 @@
 
 #include "nouveau_context.h"
 
+static INLINE int log2i(int i)
+{
+	int r = 0;
+
+	if (i & 0xffff0000) {
+		i >>= 16;
+		r += 16;
+	}
+	if (i & 0x0000ff00) {
+		i >>= 8;
+		r += 8;
+	}
+	if (i & 0x000000f0) {
+		i >>= 4;
+		r += 4;
+	}
+	if (i & 0x0000000c) {
+		i >>= 2;
+		r += 2;
+	}
+	if (i & 0x00000002) {
+		r += 1;
+	}
+	return r;
+}
+
 static INLINE int
 nv04_surface_format(enum pipe_format format)
 {
@@ -82,6 +108,56 @@ nv04_surface_copy_blit(struct nouveau_context *nv, unsigned dx, unsigned dy,
 }
 
 static int
+nv04_surface_copy_prep_swizzled(struct nouveau_context *nv,
+				struct pipe_surface *dst,
+				struct pipe_surface *src)
+{
+	struct nouveau_channel *chan = nv->nvc->channel;
+
+	BEGIN_RING(chan, nv->nvc->NvSwzSurf,
+		   NV04_SWIZZLED_SURFACE_FORMAT, 2);
+	/* FIXME: read destination format from somewhere */
+	OUT_RING  (chan,
+		NV04_SWIZZLED_SURFACE_FORMAT_COLOR_A8R8G8B8
+		| (log2i(dst->width)<<NV04_SWIZZLED_SURFACE_FORMAT_BASE_SIZE_U_SHIFT)
+		| (log2i(dst->height)<<NV04_SWIZZLED_SURFACE_FORMAT_BASE_SIZE_V_SHIFT) );
+	OUT_RELOCo(chan, nouveau_buffer(dst->buffer)->bo,
+		   NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+
+	BEGIN_RING(chan, nv->nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_CONVERSION, 13);
+	OUT_RING  (chan, NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_CONVERSION_TRUNCATE);
+	/* FIXME: read source format from somewhere */
+	OUT_RING  (chan, NV04_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_A8R8G8B8);
+	OUT_RING  (chan, NV04_SCALED_IMAGE_FROM_MEMORY_OPERATION_SRCCOPY);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, (src->height<<16) | src->width);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, (src->height<<16) | src->width);
+	OUT_RING  (chan, 1<<20);
+	OUT_RING  (chan, 1<<20);
+	OUT_RING  (chan, (src->height<<16) | src->width);
+	OUT_RING  (chan,
+		src->stride
+		| NV04_SCALED_IMAGE_FROM_MEMORY_FORMAT_ORIGIN_CENTER
+		| NV04_SCALED_IMAGE_FROM_MEMORY_FORMAT_FILTER_POINT_SAMPLE);
+	OUT_RELOCo(chan, nouveau_buffer(src->buffer)->bo,
+		   NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+	OUT_RING  (chan, 0);
+
+	BEGIN_RING(chan, nv->nvc->NvM2MF,
+		   NV04_MEMORY_TO_MEMORY_FORMAT_DMA_BUFFER_IN, 2);
+	OUT_RELOCo(chan, nouveau_buffer(src->buffer)->bo,
+		   NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_RD);
+	OUT_RELOCo(chan, nouveau_buffer(dst->buffer)->bo,
+		   NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+
+	nv->surface_copy = nv04_surface_copy_m2mf;
+	nv->surf_dst = dst;
+	nv->surf_src = src;
+	return 0;
+}
+
+static int
 nv04_surface_copy_prep(struct nouveau_context *nv, struct pipe_surface *dst,
 		       struct pipe_surface *src)
 {
@@ -91,6 +167,13 @@ nv04_surface_copy_prep(struct nouveau_context *nv, struct pipe_surface *dst,
 	if (src->format != dst->format)
 		return 1;
 
+	/* Setup transfer to swizzle the texture to vram if needed */
+	/* FIXME/TODO: check proper limits of this operation */
+	if (nouveau_buffer(dst->buffer)->bo->flags & NOUVEAU_BO_SWIZZLED) {
+		/* FIXME: Disable it for the moment */
+		/*return nv04_surface_copy_prep_swizzled(nv, dst, src);*/
+	}
+
 	/* NV_CONTEXT_SURFACES_2D has buffer alignment restrictions, fallback
 	 * to NV_MEMORY_TO_MEMORY_FORMAT in this case.
 	 */
@@ -298,6 +381,22 @@ nouveau_surface_channel_create_nv04(struct nouveau_channel_context *nvc)
 	}
 
 	BIND_RING (chan, nvc->NvSIFM, nvc->next_subchannel++);
+	BEGIN_RING(chan, nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_DMA_NOTIFY, 1);
+	OUT_RING  (chan, 0);
+	BEGIN_RING(chan, nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_DMA_IMAGE, 1);
+	OUT_RING  (chan, nvc->channel->vram->handle);
+	BEGIN_RING(chan, nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_SURFACE, 1);
+	OUT_RING  (chan, nvc->NvSwzSurf);
+	BEGIN_RING(chan, nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_PATTERN, 1);
+	OUT_RING  (chan, 0);
+	BEGIN_RING(chan, nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_ROP, 1);
+	OUT_RING  (chan, 0);
+	BEGIN_RING(chan, nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_BETA1, 1);
+	OUT_RING  (chan, 0);
+	BEGIN_RING(chan, nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_BETA4, 1);
+	OUT_RING  (chan, 0);
+	BEGIN_RING(chan, nvc->NvSIFM, NV04_SCALED_IMAGE_FROM_MEMORY_OPERATION, 1);
+	OUT_RING  (chan, NV04_SCALED_IMAGE_FROM_MEMORY_OPERATION_SRCCOPY);
 
 	return 0;
 }
diff --git a/src/gallium/winsys/g3dvl/nouveau/Makefile b/src/gallium/winsys/g3dvl/nouveau/Makefile
index 7fa29d2f5fb..5d11bde322b 100644
--- a/src/gallium/winsys/g3dvl/nouveau/Makefile
+++ b/src/gallium/winsys/g3dvl/nouveau/Makefile
@@ -34,15 +34,16 @@ LIBS		+= -ldriclient -ldrm -lnv10 -lnv30 -lnv40 -lnv50 -ldraw -ltgsi -ltranslate
 
 #############################################
 
-.PHONY	= all clean
+.PHONY	= all clean libdriclient
 
 all: ${TARGET}
 
-${TARGET}: ${OBJECTS}
+${TARGET}: ${OBJECTS} libdriclient
+	$(CC) ${LDFLAGS} -shared -o $@ ${OBJECTS} ${LIBS}
+
+libdriclient:
 	cd ${DRIDIR}/src; ${MAKE}
-	$(CC) ${LDFLAGS} -shared -o $@ $^ ${LIBS}
 
 clean:
 	cd ${DRIDIR}/src; ${MAKE} clean
 	rm -rf ${OBJECTS} ${TARGET}
-
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c
index 73ac4a4171a..1005282dd4d 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_bo.c
\ No newline at end of file
+../../drm/nouveau/nouveau_bo.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_channel.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_channel.c
index 6c9b2c48d84..5af82029508 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_channel.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_channel.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_channel.c
\ No newline at end of file
+../../drm/nouveau/nouveau_channel.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_context.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_context.c
index 5e173c76728..06a61fcda3e 100644
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_context.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_context.c
@@ -1,7 +1,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_context.h"
 #include "pipe/p_screen.h"
-#include "pipe/p_util.h"
+#include "util/u_memory.h"
 
 #include "nouveau_context.h"
 #include "nouveau_dri.h"
@@ -150,7 +150,7 @@ nouveau_context_create(dri_context_t *dri_context)
 		fb_bo = calloc(1, sizeof(struct nouveau_bo_priv));
 		fb_bo->drm.offset = nv_screen->front_offset;
 		fb_bo->drm.flags = NOUVEAU_MEM_FB;
-		fb_bo->drm.size = nv_screen->front_pitch * 
+		fb_bo->drm.size = nv_screen->front_pitch *
 				  nv_screen->front_height;
 		fb_bo->refcount = 1;
 		fb_bo->base.flags = NOUVEAU_BO_PIN | NOUVEAU_BO_VRAM;
@@ -280,7 +280,7 @@ nouveau_context_bind(struct nouveau_context *nv, dri_drawable_t *dri_drawable)
 {
 	assert(nv);
 	assert(dri_drawable);
-	
+
 	if (nv->dri_drawable != dri_drawable)
 	{
 		nv->dri_drawable = dri_drawable;
@@ -294,9 +294,9 @@ int
 nouveau_context_unbind(struct nouveau_context *nv)
 {
 	assert(nv);
-	
+
 	nv->dri_drawable = NULL;
-	
+
 	return 0;
 }
 
@@ -306,20 +306,20 @@ int bind_pipe_drawable(struct pipe_context *pipe, Drawable drawable)
 {
 	struct nouveau_context	*nv;
 	dri_drawable_t		*dri_drawable;
-	
+
 	nv = pipe->priv;
-	
+
 	driCreateDrawable(nv->nv_screen->dri_screen, drawable, &dri_drawable);
-	
+
 	nouveau_context_bind(nv, dri_drawable);
-	
+
 	return 0;
 }
 
 int unbind_pipe_drawable(struct pipe_context *pipe)
 {
 	nouveau_context_unbind(pipe->priv);
-	
+
 	return 0;
 }
 
@@ -329,15 +329,15 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
 	dri_framebuffer_t	dri_framebuf;
 	dri_context_t		*dri_context;
 	struct nouveau_context	*nv;
-	
+
 	driCreateScreen(display, screen, &dri_screen, &dri_framebuf);
 	driCreateContext(dri_screen, XDefaultVisual(display, screen), &dri_context);
-	
+
 	nouveau_screen_create(dri_screen, &dri_framebuf);
 	nouveau_context_create(dri_context);
-	
+
 	nv = dri_context->private;
-	
+
 	return nv->nvc->pctx[nv->pctx_id];
 }
 
@@ -348,15 +348,15 @@ int destroy_pipe_context(struct pipe_context *pipe)
 	struct nouveau_context	*nv;
 	dri_screen_t		*dri_screen;
 	dri_context_t		*dri_context;
-	
+
 	assert(pipe);
-	
+
 	screen = pipe->screen;
 	winsys = pipe->winsys;
 	nv = pipe->priv;
 	dri_context = nv->dri_context;
 	dri_screen = dri_context->dri_screen;
-	
+
 	pipe->destroy(pipe);
 	screen->destroy(screen);
 	free(winsys);
@@ -365,7 +365,6 @@ int destroy_pipe_context(struct pipe_context *pipe)
 	nouveau_screen_destroy(dri_screen);
 	driDestroyContext(dri_context);
 	driDestroyScreen(dri_screen);
-	
+
 	return 0;
 }
-
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_device.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_device.c
index 47d52dafa89..63f1fa040c7 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_device.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_device.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_device.c
\ No newline at end of file
+../../drm/nouveau/nouveau_device.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_dma.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_dma.c
index 45078c964f4..cd0d32e5373 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_dma.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_dma.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_dma.c
\ No newline at end of file
+../../drm/nouveau/nouveau_dma.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_dma.h b/src/gallium/winsys/g3dvl/nouveau/nouveau_dma.h
index 6b9ec777417..e6c7d4bc965 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_dma.h
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_dma.h
@@ -1 +1 @@
-../../dri/nouveau/nouveau_dma.h
\ No newline at end of file
+../../drm/nouveau/nouveau_dma.h
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_dri.h b/src/gallium/winsys/g3dvl/nouveau/nouveau_dri.h
index 0e6c9fce355..c8f9dbdc3a8 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_dri.h
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_dri.h
@@ -1 +1 @@
-../../dri/nouveau/nouveau_dri.h
\ No newline at end of file
+../../drm/nouveau/nouveau_dri.h
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_drmif.h b/src/gallium/winsys/g3dvl/nouveau/nouveau_drmif.h
index 473b7d4812d..27082c9d34c 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_drmif.h
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_drmif.h
@@ -1 +1 @@
-../../dri/nouveau/nouveau_drmif.h
\ No newline at end of file
+../../drm/nouveau/nouveau_drmif.h
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_fence.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_fence.c
index ef1f0c6afe1..51a50527e6d 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_fence.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_fence.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_fence.c
\ No newline at end of file
+../../drm/nouveau/nouveau_fence.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_grobj.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_grobj.c
index 428186544c6..db17c72e6d7 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_grobj.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_grobj.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_grobj.c
\ No newline at end of file
+../../drm/nouveau/nouveau_grobj.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_local.h b/src/gallium/winsys/g3dvl/nouveau/nouveau_local.h
index 6b878aad224..4e9d3042cb5 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_local.h
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_local.h
@@ -1 +1 @@
-../../dri/nouveau/nouveau_local.h
\ No newline at end of file
+../../drm/nouveau/nouveau_local.h
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_notifier.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_notifier.c
index 3024a612a7a..703bc3ce4ab 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_notifier.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_notifier.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_notifier.c
\ No newline at end of file
+../../drm/nouveau/nouveau_notifier.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_pushbuf.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_pushbuf.c
index dae31d97998..4ac137cadad 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_pushbuf.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_pushbuf.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_pushbuf.c
\ No newline at end of file
+../../drm/nouveau/nouveau_pushbuf.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_resource.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_resource.c
index e0d71e9d2bf..2241af328ff 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_resource.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_resource.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_resource.c
\ No newline at end of file
+../../drm/nouveau/nouveau_resource.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_screen.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_screen.c
index daea3fff680..f80d00050c8 100644
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_screen.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_screen.c
@@ -1,5 +1,5 @@
 #include "pipe/p_context.h"
-#include "pipe/p_util.h"
+#include "util/u_memory.h"
 #include "nouveau_context.h"
 #include <nouveau_drm.h>
 #include "nouveau_dri.h"
@@ -23,11 +23,11 @@ int nouveau_check_dri_drm_ddx(dri_version_t *dri, dri_version_t *drm, dri_versio
 	static const dri_version_t ddx_expected = {0, 0, NOUVEAU_DRM_HEADER_PATCHLEVEL};
 	static const dri_version_t dri_expected = {4, 0, 0};
 	static const dri_version_t drm_expected = {0, 0, NOUVEAU_DRM_HEADER_PATCHLEVEL};
-	
+
 	assert(dri);
 	assert(drm);
 	assert(ddx);
-	
+
 	if (dri->major != dri_expected.major || dri->minor < dri_expected.minor)
 	{
 		NOUVEAU_ERR("Unexpected DRI version.\n");
@@ -43,17 +43,17 @@ int nouveau_check_dri_drm_ddx(dri_version_t *dri, dri_version_t *drm, dri_versio
 		NOUVEAU_ERR("Unexpected DDX version.\n");
 		return 1;
 	}
-	
+
 	return 0;
 }
 
 int
 nouveau_screen_create(dri_screen_t *dri_screen, dri_framebuffer_t *dri_framebuf)
-{	
+{
 	struct nouveau_dri	*nv_dri = dri_framebuf->private;
 	struct nouveau_screen	*nv_screen;
 	int			ret;
-	
+
 	if (nouveau_check_dri_drm_ddx(&dri_screen->dri, &dri_screen->drm, &dri_screen->ddx))
 		return 1;
 
@@ -89,4 +89,3 @@ nouveau_screen_destroy(dri_screen_t *dri_screen)
 
 	FREE(nv_screen);
 }
-
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys.c
index 43de49b98bb..ce4052d5572 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_winsys.c
\ No newline at end of file
+../../drm/nouveau/nouveau_winsys.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
index b835bd57606..4f6ac9cad0b 100644
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
@@ -1,7 +1,7 @@
 #include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
+#include "util/u_memory.h"
 
 #include "nouveau_context.h"
 #include "nouveau_local.h"
@@ -29,7 +29,7 @@ static struct pipe_surface *
 nouveau_surface_alloc(struct pipe_winsys *ws)
 {
 	struct pipe_surface *surf;
-	
+
 	surf = CALLOC_STRUCT(pipe_surface);
 	if (!surf)
 		return NULL;
@@ -59,10 +59,10 @@ nouveau_surface_alloc_storage
 )
 {
 	const unsigned int ALIGNMENT = 256;
-	
+
 	assert(pws);
 	assert(surface);
-	
+
 	surface->width = width;
 	surface->height = height;
 	surface->format = format;
@@ -72,7 +72,7 @@ nouveau_surface_alloc_storage
 	surface->stride = round_up(surface->nblocksx * surface->block.size, ALIGNMENT);
 	surface->usage = flags;
 	surface->buffer = pws->buffer_create(pws, ALIGNMENT, PIPE_BUFFER_USAGE_PIXEL, surface->stride * surface->nblocksy);
-	
+
 	return 0;
 }
 
@@ -84,7 +84,7 @@ nouveau_surface_release(struct pipe_winsys *ws, struct pipe_surface **s)
 	*s = NULL;
 	if (--surf->refcount <= 0) {
 		if (surf->buffer)
-			pipe_buffer_reference(ws, &surf->buffer, NULL);
+			winsys_buffer_reference(ws, &surf->buffer, NULL);
 		free(surf);
 	}
 }
@@ -258,4 +258,3 @@ nouveau_create_pipe_winsys(struct nouveau_context *nv)
 
 	return &nvpws->pws;
 }
-
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.h b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.h
index 264716fef04..9d9460883e0 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.h
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.h
@@ -1 +1 @@
-../../dri/nouveau/nouveau_winsys_pipe.h
\ No newline at end of file
+../../drm/nouveau/nouveau_winsys_pipe.h
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_softpipe.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_softpipe.c
index 83faccde969..ec613ecbf65 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_softpipe.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_softpipe.c
@@ -1 +1 @@
-../../dri/nouveau/nouveau_winsys_softpipe.c
\ No newline at end of file
+../../drm/nouveau/nouveau_winsys_softpipe.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nv04_surface.c b/src/gallium/winsys/g3dvl/nouveau/nv04_surface.c
index e05f0671d63..4455d8f9243 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nv04_surface.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nv04_surface.c
@@ -1 +1 @@
-../../dri/nouveau/nv04_surface.c
\ No newline at end of file
+../../drm/nouveau/nv04_surface.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/nouveau/nv50_surface.c b/src/gallium/winsys/g3dvl/nouveau/nv50_surface.c
index 3850748229d..19f102001e9 120000
--- a/src/gallium/winsys/g3dvl/nouveau/nv50_surface.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nv50_surface.c
@@ -1 +1 @@
-../../dri/nouveau/nv50_surface.c
\ No newline at end of file
+../../drm/nouveau/nv50_surface.c
\ No newline at end of file
diff --git a/src/gallium/winsys/g3dvl/xsp_winsys.c b/src/gallium/winsys/g3dvl/xsp_winsys.c
index 0100fe37bdb..68be2c2ea3a 100644
--- a/src/gallium/winsys/g3dvl/xsp_winsys.c
+++ b/src/gallium/winsys/g3dvl/xsp_winsys.c
@@ -2,8 +2,8 @@
 #include <X11/Xutil.h>
 #include <pipe/p_winsys.h>
 #include <pipe/p_state.h>
-#include <pipe/p_util.h>
 #include <pipe/p_inlines.h>
+#include <util/u_memory.h>
 #include <softpipe/sp_winsys.h>
 
 /* pipe_winsys implementation */
@@ -33,79 +33,79 @@ struct xsp_buffer
 static struct pipe_buffer* xsp_buffer_create(struct pipe_winsys *pws, unsigned alignment, unsigned usage, unsigned size)
 {
 	struct xsp_buffer *buffer;
-	
+
 	assert(pws);
-	
+
 	buffer = calloc(1, sizeof(struct xsp_buffer));
 	buffer->base.refcount = 1;
 	buffer->base.alignment = alignment;
 	buffer->base.usage = usage;
 	buffer->base.size = size;
 	buffer->data = align_malloc(size, alignment);
-	
+
 	return (struct pipe_buffer*)buffer;
 }
 
 static struct pipe_buffer* xsp_user_buffer_create(struct pipe_winsys *pws, void *data, unsigned size)
 {
 	struct xsp_buffer *buffer;
-	
+
 	assert(pws);
-	
+
 	buffer = calloc(1, sizeof(struct xsp_buffer));
 	buffer->base.refcount = 1;
 	buffer->base.size = size;
 	buffer->is_user_buffer = TRUE;
 	buffer->data = data;
-	
+
 	return (struct pipe_buffer*)buffer;
 }
 
 static void* xsp_buffer_map(struct pipe_winsys *pws, struct pipe_buffer *buffer, unsigned flags)
 {
 	struct xsp_buffer *xsp_buf = (struct xsp_buffer*)buffer;
-	
+
 	assert(pws);
 	assert(buffer);
-	
+
 	xsp_buf->mapped_data = xsp_buf->data;
-	
+
 	return xsp_buf->mapped_data;
 }
 
 static void xsp_buffer_unmap(struct pipe_winsys *pws, struct pipe_buffer *buffer)
 {
 	struct xsp_buffer *xsp_buf = (struct xsp_buffer*)buffer;
-	
+
 	assert(pws);
 	assert(buffer);
-	
+
 	xsp_buf->mapped_data = NULL;
 }
 
 static void xsp_buffer_destroy(struct pipe_winsys *pws, struct pipe_buffer *buffer)
 {
 	struct xsp_buffer *xsp_buf = (struct xsp_buffer*)buffer;
-	
+
 	assert(pws);
 	assert(buffer);
-	
+
 	if (!xsp_buf->is_user_buffer)
 		align_free(xsp_buf->data);
-	
+
 	free(xsp_buf);
 }
 
 static struct pipe_surface* xsp_surface_alloc(struct pipe_winsys *pws)
 {
 	struct pipe_surface *surface;
-	
+
 	assert(pws);
-	
+
 	surface = calloc(1, sizeof(struct pipe_surface));
 	surface->refcount = 1;
 	surface->winsys = pws;
-	
+
 	return surface;
 }
 
@@ -127,10 +127,10 @@ static int xsp_surface_alloc_storage
 )
 {
 	const unsigned int ALIGNMENT = 1;
-	
+
 	assert(pws);
 	assert(surface);
-	
+
 	surface->width = width;
 	surface->height = height;
 	surface->format = format;
@@ -140,28 +140,28 @@ static int xsp_surface_alloc_storage
 	surface->stride = round_up(surface->nblocksx * surface->block.size, ALIGNMENT);
 	surface->usage = flags;
 	surface->buffer = pws->buffer_create(pws, ALIGNMENT, PIPE_BUFFER_USAGE_PIXEL, surface->stride * surface->nblocksy);
-	
+
 	return 0;
 }
 
 static void xsp_surface_release(struct pipe_winsys *pws, struct pipe_surface **surface)
 {
 	struct pipe_surface *s;
-	
+
 	assert(pws);
 	assert(surface);
 	assert(*surface);
-	
+
 	s = *surface;
-	
+
 	s->refcount--;
-	
+
 	if (s->refcount == 0)
 	{
-		pipe_buffer_reference(pws, &s->buffer, NULL);
+		winsys_buffer_reference(pws, &s->buffer, NULL);
 		free(s);
 	}
-	
+
 	*surface = NULL;
 }
 
@@ -176,7 +176,7 @@ static int xsp_fence_signalled(struct pipe_winsys *pws, struct pipe_fence_handle
 {
 	assert(pws);
 	assert(fence);
-	
+
 	return 0;
 }
 
@@ -184,30 +184,30 @@ static int xsp_fence_finish(struct pipe_winsys *pws, struct pipe_fence_handle *f
 {
 	assert(pws);
 	assert(fence);
-	
+
 	return 0;
 }
 
 static void xsp_flush_frontbuffer(struct pipe_winsys *pws, struct pipe_surface *surface, void *context_private)
-{	
+{
 	struct xsp_pipe_winsys	*xsp_winsys;
 	struct xsp_context	*xsp_context;
-	
+
 	assert(pws);
 	assert(surface);
 	assert(context_private);
-	
+
 	xsp_winsys = (struct xsp_pipe_winsys*)pws;
 	xsp_context = (struct xsp_context*)context_private;
-	
+
 	if (!xsp_context->drawable_bound)
 		return;
-	
+
 	xsp_winsys->fbimage.width = surface->width;
 	xsp_winsys->fbimage.height = surface->height;
 	xsp_winsys->fbimage.bytes_per_line = surface->width * (xsp_winsys->fbimage.bits_per_pixel >> 3);
 	xsp_winsys->fbimage.data = pipe_surface_map(surface, 0);
-	
+
 	XPutImage
 	(
 		xsp_context->display,
@@ -236,25 +236,25 @@ static const char* xsp_get_name(struct pipe_winsys *pws)
 int bind_pipe_drawable(struct pipe_context *pipe, Drawable drawable)
 {
 	struct xsp_context *xsp_context;
-	
+
 	assert(pipe);
-	
+
 	xsp_context = pipe->priv;
 	xsp_context->drawable = drawable;
 	xsp_context->drawable_bound = 1;
-	
+
 	return 0;
 }
 
 int unbind_pipe_drawable(struct pipe_context *pipe)
 {
 	struct xsp_context *xsp_context;
-	
+
 	assert(pipe);
-	
+
 	xsp_context = pipe->priv;
 	xsp_context->drawable_bound = 0;
-	
+
 	return 0;
 }
 
@@ -264,9 +264,9 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
 	struct xsp_context	*xsp_context;
 	struct pipe_screen	*sp_screen;
 	struct pipe_context	*sp_pipe;
-	
+
 	assert(display);
-	
+
 	xsp_winsys = calloc(1, sizeof(struct xsp_pipe_winsys));
 	xsp_winsys->base.buffer_create = xsp_buffer_create;
 	xsp_winsys->base.user_buffer_create = xsp_user_buffer_create;
@@ -281,7 +281,7 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
 	xsp_winsys->base.fence_finish = xsp_fence_finish;
 	xsp_winsys->base.flush_frontbuffer = xsp_flush_frontbuffer;
 	xsp_winsys->base.get_name = xsp_get_name;
-	
+
 	{
 		/* XXX: Can't use the returned XImage* directly,
 		since we don't have control over winsys destruction
@@ -299,22 +299,22 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
 			32,
 			0
 		);
-		
+
 		memcpy(&xsp_winsys->fbimage, template, sizeof(XImage));
 		XInitImage(&xsp_winsys->fbimage);
-		
+
 		XDestroyImage(template);
 	}
-	
+
 	sp_screen = softpipe_create_screen((struct pipe_winsys*)xsp_winsys);
 	sp_pipe = softpipe_create(sp_screen, (struct pipe_winsys*)xsp_winsys, NULL);
-	
+
 	xsp_context = calloc(1, sizeof(struct xsp_context));
 	xsp_context->display = display;
 	xsp_context->screen = screen;
-	
+
 	sp_pipe->priv = xsp_context;
-	
+
 	return sp_pipe;
 }
 
@@ -322,16 +322,15 @@ int destroy_pipe_context(struct pipe_context *pipe)
 {
 	struct pipe_screen *screen;
 	struct pipe_winsys *winsys;
-	
+
 	assert(pipe);
-	
+
 	screen = pipe->screen;
 	winsys = pipe->winsys;
 	free(pipe->priv);
 	pipe->destroy(pipe);
 	screen->destroy(screen);
 	free(winsys);
-	
+
 	return 0;
 }
-