--- old/r128_cursor.c	Sat Mar  3 17:26:09 2001
+++ new/r128_cursor.c	Sat Sep  7 18:48:36 2002
@@ -66,14 +66,30 @@
 #endif
 
 
+/************************************************
+
+All of the functions in here are probably broken since I don't have the docs.
+
+*************************************************/
+
+
+
 /* Set cursor foreground and background colors. */
 static void R128SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
 {
     R128InfoPtr   info      = R128PTR(pScrn);
     unsigned char *R128MMIO = info->MMIO;
-
+    if(info->IsSecondary)
+    {
+    /* what goes here? */
+    OUTREG(R128_CUR_CLR0, bg);
+    OUTREG(R128_CUR_CLR1, fg);
+    }
+    else
+    {
     OUTREG(R128_CUR_CLR0, bg);
     OUTREG(R128_CUR_CLR1, fg);
+    }
 }
 
 /* Set cursor position to (x,y) with offset into cursor bitmap at
@@ -94,11 +110,23 @@
     if (xorigin >= cursor->MaxWidth)  xorigin = cursor->MaxWidth - 1;
     if (yorigin >= cursor->MaxHeight) yorigin = cursor->MaxHeight - 1;
 
-    OUTREG(R128_CUR_HORZ_VERT_OFF,  R128_CUR_LOCK | (xorigin << 16) | yorigin);
-    OUTREG(R128_CUR_HORZ_VERT_POSN, (R128_CUR_LOCK
-				     | ((xorigin ? 0 : x) << 16)
-				     | (yorigin ? 0 : y)));
-    OUTREG(R128_CUR_OFFSET,         info->cursor_start + yorigin * 16);
+    if(!info->IsSecondary)
+        {
+    	OUTREG(R128_CUR_HORZ_VERT_OFF,  R128_CUR_LOCK | (xorigin << 16) | yorigin);
+    	OUTREG(R128_CUR_HORZ_VERT_POSN, (R128_CUR_LOCK
+				     	| ((xorigin ? 0 : x) << 16)
+				     	| (yorigin ? 0 : y)));
+    	OUTREG(R128_CUR_OFFSET,         info->cursor_start + yorigin * 16);
+        }
+        else
+        {
+    	/* what goes here? */
+    	OUTREG(R128_CUR_HORZ_VERT_OFF,  R128_CUR_LOCK | (xorigin << 16) | yorigin);
+    	OUTREG(R128_CUR_HORZ_VERT_POSN, (R128_CUR_LOCK
+				     	| ((xorigin ? 0 : x) << 16)
+				     	| (yorigin ? 0 : y)));
+    	OUTREG(R128_CUR_OFFSET,         info->cursor_start + yorigin * 16);
+        }
 }
 
 /* Copy cursor image from `image' to video memory.  R128SetCursorPosition
@@ -112,8 +140,17 @@
     int           y;
     CARD32        save;
 
+    if(!info->IsSecondary)
+    {
     save = INREG(R128_CRTC_GEN_CNTL);
     OUTREG(R128_CRTC_GEN_CNTL, save & (CARD32)~R128_CRTC_CUR_EN);
+    }
+    else
+    { 
+	/* what goes here? */
+        save = INREG(R128_CRTC2_GEN_CNTL);
+        OUTREG(R128_CRTC2_GEN_CNTL, save & (CARD32)~R128_CRTC_CUR_EN);
+    }
 
 #if X_BYTE_ORDER == X_BIG_ENDIAN
     switch(info->CurrentLayout.pixel_bytes) {
@@ -168,8 +205,10 @@
 	*d++ = 0x00000000;
     }
 
-
+    if(!info->IsSecondary)
     OUTREG(R128_CRTC_GEN_CNTL, save);
+    else
+        OUTREG(R128_CRTC2_GEN_CNTL, save);
 }
 
 /* Hide hardware cursor. */
@@ -177,7 +216,9 @@
 {
     R128InfoPtr   info      = R128PTR(pScrn);
     unsigned char *R128MMIO = info->MMIO;
-
+     if(info->IsSecondary)
+        OUTREGP(R128_CRTC2_GEN_CNTL, 0, ~R128_CRTC_CUR_EN);
+     else
     OUTREGP(R128_CRTC_GEN_CNTL, 0, ~R128_CRTC_CUR_EN);
 }
 
@@ -187,7 +228,15 @@
     R128InfoPtr   info      = R128PTR(pScrn);
     unsigned char *R128MMIO = info->MMIO;
 
+    if(info->IsSecondary)
+    {
+         OUTREGP(R128_CRTC2_GEN_CNTL, R128_CRTC_CUR_EN,
+               ~R128_CRTC_CUR_EN);
+    }
+    else
+    {
     OUTREGP(R128_CRTC_GEN_CNTL, R128_CRTC_CUR_EN, ~R128_CRTC_CUR_EN);
+    }
 }
 
 /* Determine if hardware cursor is in use. */