xf86-video-ati: Branch 'randr-1.2'

[Alex Deucher]

 src/radeon_cursor.c |   26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)

New commits:
diff-tree 771c37fcac8104b894120cc3fc0154b31b0318d1 (from 01bd5eb713500d3e3d4351865d460c8d1e476454)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Mon Jun 25 17:53:26 2007 -0400

    RADEON: attempt to fix cursor on big endian (only tested on x86)

diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
index 98f4560..e59d2b3 100644
--- a/src/radeon_cursor.c
+++ b/src/radeon_cursor.c
@@ -219,10 +219,8 @@ radeon_crtc_load_cursor_argb (xf86CrtcPt
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
     CARD32        *d          = (CARD32 *)(pointer)(info->FB + info->cursor_offset + pScrn->fbOffset);
-#if 0
     int            x, y, w, h;
     CARD32	  *i;
-#endif
 
     RADEONCTRACE(("RADEONLoadCursorARGB\n"));
 
@@ -230,30 +228,14 @@ radeon_crtc_load_cursor_argb (xf86CrtcPt
 
     CURSOR_SWAPPING_START();
 
-
-    memcpy (d, image, CURSOR_HEIGHT * CURSOR_WIDTH * 4);
-#if 0
-    w = pCurs->bits->width;
-    if (w > CURSOR_WIDTH)
-	w = CURSOR_WIDTH;
-    h = pCurs->bits->height;
-    if (h > CURSOR_HEIGHT)
-	h = CURSOR_HEIGHT;
-    for (y = 0; y < h; y++)
-    {
+    w = CURSOR_WIDTH;
+    h = CURSOR_HEIGHT;
+    for (y = 0; y < h; y++) {
 	i = image;
-	image += pCurs->bits->width;
+	image += w;
 	for (x = 0; x < w; x++)
 	    *d++ = *i++;
-	/* pad to the right with transparent */
-	for (; x < CURSOR_WIDTH; x++)
-	    *d++ = 0;
     }
-    /* pad below with transparent */
-    for (; y < CURSOR_HEIGHT; y++)
-	for (x = 0; x < CURSOR_WIDTH; x++)
-	    *d++ = 0;
-#endif
 
     CURSOR_SWAPPING_END ();
 }