From 6d8caf5e0dd915809152c52c2c56a39d76e2ed8c Mon Sep 17 00:00:00 2001
From: Arthur Huillet <arthur.huillet@free.fr>
Date: Sat, 13 Oct 2007 22:28:39 +0200
Subject: [PATCH] EXA: now caching BLIT_OPERATION and RECT_OPERATION (0x2FC) to
 limit the number of IRQs on NV04

---
 src/nv_exa.c  | 41 +++++++++++++++++++++++++++++++++--------
 src/nv_type.h |  5 +++++
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/nv_exa.c b/src/nv_exa.c
index be1a95f..4bda47f 100644
--- a/src/nv_exa.c
+++ b/src/nv_exa.c
@@ -122,6 +122,28 @@ static void setM2MFDirection(ScrnInfoPtr pScrn, int dir)
 	}
 }
 
+static void setcurrentRectOp(ScrnInfoPtr pScrn, int op)
+{
+	NVPtr pNv = NVPTR(pScrn);
+
+	if (pNv->currentRectOp != op) {
+		NVDmaStart(pNv, NvRectangle, NV04_GDI_RECTANGLE_TEXT_OPERATION, 1);
+		NVDmaNext (pNv, op);
+		pNv->currentRectOp = op;
+	}
+}
+
+static void setcurrentBlitOp(ScrnInfoPtr pScrn, int op)
+{
+	NVPtr pNv = NVPTR(pScrn);
+
+	if (pNv->currentBlitOp != op) {
+		NVDmaStart(pNv, NvImageBlit, NV_IMAGE_BLIT_OPERATION, 1);
+		NVDmaNext (pNv, op);
+		pNv->currentBlitOp = op;
+	}
+}
+
 static CARD32 rectFormat(DrawablePtr pDrawable)
 {
 	switch(pDrawable->bitsPerPixel) {
@@ -157,12 +179,10 @@ static Bool NVExaPrepareSolid(PixmapPtr pPixmap,
 	if (planemask != ~0 || alu != GXcopy) {
 		if (pPixmap->drawable.bitsPerPixel == 32)
 			return FALSE;
-		NVDmaStart(pNv, NvRectangle, NV04_GDI_RECTANGLE_TEXT_OPERATION, 1);
-		NVDmaNext (pNv, 1 /* ROP_AND */);
+		setcurrentRectOp(pScrn, 1);
 		NVSetROP(pScrn, alu, planemask);
 	} else {
-		NVDmaStart(pNv, NvRectangle, NV04_GDI_RECTANGLE_TEXT_OPERATION, 1);
-		NVDmaNext (pNv, 3 /* SRCCOPY */);
+		setcurrentRectOp(pScrn, 3);
 	}
 
 	if (!NVAccelGetCtxSurf2DFormatFromPixmap(pPixmap, &fmt))
@@ -225,12 +245,10 @@ static Bool NVExaPrepareCopy(PixmapPtr pSrcPixmap,
 	if (planemask != ~0 || alu != GXcopy) {
 		if (pDstPixmap->drawable.bitsPerPixel == 32)
 			return FALSE;
-		NVDmaStart(pNv, NvImageBlit, NV_IMAGE_BLIT_OPERATION, 1);
-		NVDmaNext (pNv, 1 /* ROP_AND */);
+		setcurrentBlitOp(pScrn, 1);
 		NVSetROP(pScrn, alu, planemask);
 	} else {
-		NVDmaStart(pNv, NvImageBlit, NV_IMAGE_BLIT_OPERATION, 1);
-		NVDmaNext (pNv, 3 /* SRCCOPY */);
+		setcurrentBlitOp(pScrn, 3);
 	}
 
 	if (!NVAccelGetCtxSurf2DFormatFromPixmap(pDstPixmap, &fmt))
@@ -795,6 +813,13 @@ Bool NVExaInit(ScreenPtr pScreen)
 	}
 
 	switch (pNv->Architecture) {
+//not working yet		
+/*	case NV_ARCH_10:
+		pNv->EXADriverPtr->CheckComposite   = NV10CheckComposite;
+		pNv->EXADriverPtr->PrepareComposite = NV10PrepareComposite;
+		pNv->EXADriverPtr->Composite        = NV10Composite;
+		pNv->EXADriverPtr->DoneComposite    = NV10DoneComposite;
+		break;*/
 #if defined(ENABLE_NV30EXA)
 //	not working yet
 /*
diff --git a/src/nv_type.h b/src/nv_type.h
index b365bc5..740b52d 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -343,6 +343,11 @@ typedef struct _NVRec {
     CARD32              currentRop;
     int                 M2MFDirection;
 
+    /* the following two are used to limit the amount
+    of 0x2FC calls that are SW on nv04 */
+    int			currentRectOp;
+    int			currentBlitOp;
+
     Bool                WaitVSyncPossible;
     Bool                BlendingPossible;
     Bool                RandRRotation;
-- 
2.32.0.93.g670b81a890