general tidy-ups in preparation for merge to master

3 files changed, 20 insertions, 36 deletions

diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
index dc46d60..6ffee2a 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -439,9 +439,14 @@ nouveau_exa_upload_to_screen(PixmapPtr pdpix, int x, int y, int w, int h,
 
 	/* try gart-based transfer */
 	if (pNv->GART) {
-		Bool ret = (pNv->Architecture >= NV_ARCH_C0) ?
-			NVC0AccelUploadM2MF(pdpix, x, y, w, h, src, src_pitch) :
-			NVAccelUploadM2MF(pdpix, x, y, w, h, src, src_pitch);
+		if (pNv->Architecture < NV_ARCH_C0) {
+			ret = NVAccelUploadM2MF(pdpix, x, y, w, h,
+						src, src_pitch);
+		} else {
+			ret = NVC0AccelUploadM2MF(pdpix, x, y, w, h,
+						  src, src_pitch);
+		}
+
 		if (ret) {
 			exaMarkSync(pdpix->drawable.pScreen);
 			return TRUE;
@@ -482,8 +487,6 @@ nouveau_exa_init(ScreenPtr pScreen)
 		return FALSE;
 	}
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "nouveau EXA init\n");
-
 	exa->exa_major = EXA_VERSION_MAJOR;
 	exa->exa_minor = EXA_VERSION_MINOR;
 	exa->flags = EXA_OFFSCREEN_PIXMAPS;
@@ -529,7 +532,8 @@ nouveau_exa_init(ScreenPtr pScreen)
 		exa->PrepareSolid = NV04EXAPrepareSolid;
 		exa->Solid = NV04EXASolid;
 		exa->DoneSolid = NV04EXADoneSolid;
-	} else {
+	} else
+	if (pNv->Architecture < NV_ARCH_C0) {
 		exa->PrepareCopy = NV50EXAPrepareCopy;
 		exa->Copy = NV50EXACopy;
 		exa->DoneCopy = NV50EXADoneCopy;
@@ -537,6 +541,14 @@ nouveau_exa_init(ScreenPtr pScreen)
 		exa->PrepareSolid = NV50EXAPrepareSolid;
 		exa->Solid = NV50EXASolid;
 		exa->DoneSolid = NV50EXADoneSolid;
+	} else {
+		exa->PrepareCopy = NVC0EXAPrepareCopy;
+		exa->Copy        = NVC0EXACopy;
+		exa->DoneCopy    = NVC0EXADoneCopy;
+
+		exa->PrepareSolid = NVC0EXAPrepareSolid;
+		exa->Solid        = NVC0EXASolid;
+		exa->DoneSolid    = NVC0EXADoneSolid;
 	}
 
 	switch (pNv->Architecture) {	
@@ -566,16 +578,6 @@ nouveau_exa_init(ScreenPtr pScreen)
 		exa->DoneComposite    = NV50EXADoneComposite;
 		break;
 	case NV_ARCH_C0:
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-			   "EXA func pointers for NVC0\n");
-		exa->PrepareCopy = NVC0EXAPrepareCopy;
-		exa->Copy        = NVC0EXACopy;
-		exa->DoneCopy    = NVC0EXADoneCopy;
-
-		exa->PrepareSolid = NVC0EXAPrepareSolid;
-		exa->Solid        = NVC0EXASolid;
-		exa->DoneSolid    = NVC0EXADoneSolid;
-
 		exa->CheckComposite   = NVC0EXACheckComposite;
 		exa->PrepareComposite = NVC0EXAPrepareComposite;
 		exa->Composite        = NVC0EXAComposite;
@@ -587,7 +589,6 @@ nouveau_exa_init(ScreenPtr pScreen)
 
 	if (!exaDriverInit(pScreen, exa))
 		return FALSE;
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "exaDriverInit successful\n");
 
 	pNv->EXADriverPtr = exa;
 	return TRUE;
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c
index 42ddef1..ac4f628 100644
--- a/src/nv_accel_common.c
+++ b/src/nv_accel_common.c
@@ -625,8 +625,6 @@ NVAccelCommonInit(ScrnInfoPtr pScrn)
 	if (pNv->NoAccel)
 		return TRUE;
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVAccelCommonInit\n");
-
 	/* General engine objects */
 	if (pNv->Architecture < NV_ARCH_C0)
 		INIT_CONTEXT_OBJECT(DmaNotifier0);
diff --git a/src/nvc0_accel.c b/src/nvc0_accel.c
index 521c032..aef8305 100644
--- a/src/nvc0_accel.c
+++ b/src/nvc0_accel.c
@@ -32,8 +32,6 @@ NVAccelInitM2MF_NVC0(ScrnInfoPtr pScrn)
 	struct nouveau_channel *chan = pNv->chan;
 	int ret;
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "init NVC0_M2MF (9039)\n");
-
 	ret = nouveau_grobj_alloc(chan, 0x9039, 0x9039, &pNv->NvMemFormat);
 	if (ret)
 		return FALSE;
@@ -48,8 +46,6 @@ NVAccelInit2D_NVC0(ScrnInfoPtr pScrn)
 	struct nouveau_channel *chan = pNv->chan;
 	int ret;
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "init NVC0_2D (902d)\n");
-
 	ret = nouveau_grobj_alloc(chan, 0x902d, 0x902d, &pNv->Nv2D);
 	if (ret)
 		return FALSE;
@@ -78,7 +74,6 @@ NVAccelInit2D_NVC0(ScrnInfoPtr pScrn)
 	BEGIN_RING(chan, pNv->Nv2D, NV50_2D_PATTERN_FORMAT, 2);
 	OUT_RING  (chan, 2);
 	OUT_RING  (chan, 1);
-
 	FIRE_RING (chan);
 
 	pNv->currentRop = 0xfffffffa;
@@ -120,8 +115,6 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
 	m2mf = pNv->NvMemFormat;
 	fermi = pNv->Nv3D;
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "init NVC0_3D (%x)\n", tclClass);
-
 	if (MARK_RING(chan, 512, 32))
 		return FALSE;
 
@@ -161,7 +154,6 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
 	OUT_RING  (chan, 0x1111);
 	for (i = 1; i < 8; ++i)
 		OUT_RING(chan, 0);
-
 	FIRE_RING (chan);
 
 	BEGIN_RING(chan, fermi, NVC0_3D_SCREEN_SCISSOR_HORIZ, 2);
@@ -200,7 +192,6 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
 	OUT_RELOCh(chan, bo, MISC_OFFSET, NOUVEAU_BO_VRAM | NOUVEAU_BO_RDWR);
 	OUT_RELOCl(chan, bo, MISC_OFFSET, NOUVEAU_BO_VRAM | NOUVEAU_BO_RDWR);
 	OUT_RING  (chan, 1);
-
 	FIRE_RING (chan);
 
 	BEGIN_RING(chan, fermi, NVC0_3D_CODE_ADDRESS_HIGH, 2);
@@ -263,8 +254,7 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
 	OUT_RING  (chan, 0);
 	BEGIN_RING(chan, fermi, 0x2600, 1);
 	OUT_RING  (chan, 1);
-
-	FIRE_RING (chan); usleep(500);
+	FIRE_RING (chan);
 
 	BEGIN_RING(chan, m2mf, NVC0_M2MF_OFFSET_OUT_HIGH, 2);
 	if (OUT_RELOCh(chan, bo, PFP_S, NOUVEAU_BO(VRAM, VRAM, WR)) ||
@@ -597,7 +587,6 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
 	OUT_RING  (chan, 0x28000000); /* mov b32 $r0 $r3 */
 	OUT_RING  (chan, 0x00001de7);
 	OUT_RING  (chan, 0x80000000); /* exit */
-
 	FIRE_RING (chan);
 
 	BEGIN_RING(chan, m2mf, NVC0_M2MF_OFFSET_OUT_HIGH, 2);
@@ -673,7 +662,6 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
 
 	BEGIN_RING(chan, fermi, 0x021c, 1); /* CODE_FLUSH ? */
 	OUT_RING  (chan, 0x1111);
-
 	FIRE_RING (chan);
 
 	BEGIN_RING(chan, fermi, NVC0_3D_SP_SELECT(5), 2);
@@ -733,10 +721,7 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
 	BEGIN_RING(chan, fermi, NVC0_3D_SCISSOR_HORIZ(0), 2);
 	OUT_RING  (chan, (8192 << 16) | 0);
 	OUT_RING  (chan, (8192 << 16) | 0);
-
-	FIRE_RING (chan); usleep(50);
-
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVC0_3D has been initialized\n");
+	FIRE_RING (chan);
 
 	return TRUE;
 }