nouveau: say goodbye to the old DRI driver...

1 files changed, 0 insertions, 98 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_object.c b/src/mesa/drivers/dri/nouveau/nouveau_object.c
deleted file mode 100644
index 8f33093f1a..0000000000
--- a/src/mesa/drivers/dri/nouveau/nouveau_object.c
+++ /dev/null
@@ -1,98 +0,0 @@
-
-#include "nouveau_fifo.h"
-#include "nouveau_object.h"
-#include "nouveau_reg.h"
-
-
-GLboolean nouveauCreateContextObject(nouveauContextPtr nmesa,
-				     uint32_t handle, int class)
-{
-	struct drm_nouveau_grobj_alloc cto;
-	int ret;
-
-	cto.channel = nmesa->fifo.drm.channel;
-	cto.handle  = handle;
-	cto.class   = class;
-	ret = drmCommandWrite(nmesa->driFd, DRM_NOUVEAU_GROBJ_ALLOC,
-			      &cto, sizeof(cto));
-
-	return ret == 0;
-}
-
-void nouveauObjectOnSubchannel(nouveauContextPtr nmesa, int subchannel, int handle)
-{
-	BEGIN_RING_SIZE(subchannel, 0, 1);
-	OUT_RING(handle);
-}
-
-void nouveauObjectInit(nouveauContextPtr nmesa)
-{
-#ifdef NOUVEAU_RING_DEBUG
-	return;
-#endif
-
-	nouveauCreateContextObject(nmesa, Nv3D, nmesa->screen->card->class_3d);
-	if (nmesa->screen->card->type>=NV_10) {
-		nouveauCreateContextObject(nmesa, NvCtxSurf2D, NV10_CONTEXT_SURFACES_2D);
-	} else {
-		nouveauCreateContextObject(nmesa, NvCtxSurf2D, NV04_CONTEXT_SURFACES_2D);
-		nouveauCreateContextObject(nmesa, NvCtxSurf3D, NV04_CONTEXT_SURFACES_3D);
-	}
-	if (nmesa->screen->card->type>=NV_11) {
-		nouveauCreateContextObject(nmesa, NvImageBlit, NV11_IMAGE_BLIT);
-	} else {
-		nouveauCreateContextObject(nmesa, NvImageBlit, NV_IMAGE_BLIT);
-	}
-	if ((nmesa->screen->card->type>=NV_10) && (nmesa->screen->card->type<NV_20)) {
-		nouveauCreateContextObject(nmesa, NvGdiRectText, NV04_GDI_RECTANGLE_TEXT);
-		nouveauCreateContextObject(nmesa, NvRasterOp, NV03_PRIMITIVE_RASTER_OP);
-		nouveauCreateContextObject(nmesa, NvPattern, NV04_IMAGE_PATTERN);
-	}
-	nouveauCreateContextObject(nmesa, NvMemFormat, NV_MEMORY_TO_MEMORY_FORMAT);
-
-	nouveauObjectOnSubchannel(nmesa, NvSubCtxSurf2D, NvCtxSurf2D);
-	BEGIN_RING_SIZE(NvSubCtxSurf2D, NV10_CONTEXT_SURFACES_2D_SET_DMA_IN_MEMORY0, 2);
-	OUT_RING(NvDmaFB);
-	OUT_RING(NvDmaFB);
-
-	nouveauObjectOnSubchannel(nmesa, NvSubImageBlit, NvImageBlit);
-	BEGIN_RING_SIZE(NvSubImageBlit, NV_IMAGE_BLIT_SET_SURFACES_2D, 1);
-	OUT_RING(NvCtxSurf2D);
-	BEGIN_RING_SIZE(NvSubImageBlit, NV_IMAGE_BLIT_OPERATION, 1);
-	OUT_RING(3); /* SRCCOPY */
-
-	if ((nmesa->screen->card->type>=NV_10) && (nmesa->screen->card->type<NV_20)) {
-		nouveauObjectOnSubchannel(nmesa, NvSubPattern, NvPattern);
-
-		BEGIN_RING_SIZE(NvSubPattern, NV04_IMAGE_PATTERN_COLOR_FORMAT, 4);
-		OUT_RING(1);	/* A16R5G6B5 */
-		OUT_RING(1);	/* little endian */
-		OUT_RING(0);	/* 8x8 */
-		OUT_RING(1);	/* monochrome */
-
-		nouveauObjectOnSubchannel(nmesa, NvSubRasterOp, NvRasterOp);
-
-		BEGIN_RING_SIZE(NvSubRasterOp, NV03_PRIMITIVE_RASTER_OP_DMA_NOTIFY, 1);
-		OUT_RING(NvSyncNotify);
-
-		nouveauObjectOnSubchannel(nmesa, NvSubGdiRectText, NvGdiRectText);
-
-		BEGIN_RING_SIZE(NvSubGdiRectText, NV04_GDI_RECTANGLE_TEXT_SET_DMA_NOTIFY, 1);
-		OUT_RING(NvSyncNotify);
-		BEGIN_RING_SIZE(NvSubGdiRectText, NV04_GDI_RECTANGLE_TEXT_PATTERN, 2);
-		OUT_RING(NvPattern);
-		OUT_RING(NvRasterOp);
-		BEGIN_RING_SIZE(NvSubGdiRectText, NV04_GDI_RECTANGLE_TEXT_SURFACE, 1);
-		OUT_RING(NvCtxSurf2D);
-		BEGIN_RING_SIZE(NvSubGdiRectText, NV04_GDI_RECTANGLE_TEXT_FORMAT, 2);
-		OUT_RING(1);	/* X1R5G5B5 */
-		OUT_RING(1);	/* little endian */
-	}
-
-	nouveauObjectOnSubchannel(nmesa, NvSubMemFormat, NvMemFormat);
-
-	nouveauObjectOnSubchannel(nmesa, NvSub3D, Nv3D);
-}
-
-
-