diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2008-07-11 17:28:03 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2008-08-25 10:05:50 -0400 |
| commit | 4dff54a3c8d7c9f2d6ec50354ff0b92f1b7fcbdf (patch) | |
| tree | a51f0192a20346ab3aad697011b94fd5d9d3606a /src/radeon_cursor.c | |
| parent | 5b1978a4796bcc31ac2f01d303dc8f8f44323025 (diff) | |
Switch cursors over to generic allocator
Diffstat (limited to 'src/radeon_cursor.c')
| -rw-r--r-- | src/radeon_cursor.c | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index 13c2b9cb..11fd4984 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -327,49 +327,30 @@ Bool RADEONCursorInit(ScreenPtr pScreen) int width_bytes; int height; int size_bytes; - uint32_t cursor_offset = 0; int c; size_bytes = CURSOR_WIDTH * 4 * CURSOR_HEIGHT; width = pScrn->displayWidth; width_bytes = width * (pScrn->bitsPerPixel / 8); height = ((size_bytes * xf86_config->num_crtc) + width_bytes - 1) / width_bytes; + int align = IS_AVIVO_VARIANT ? 4096 : 256; -#ifdef USE_XAA - if (!info->useEXA) { - int align = IS_AVIVO_VARIANT ? 4096 : 256; - FBAreaPtr fbarea; + for (c = 0; c < xf86_config->num_crtc; c++) { + xf86CrtcPtr crtc = xf86_config->crtc[c]; + RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private; - fbarea = xf86AllocateOffscreenArea(pScreen, width, height, - align, NULL, NULL, NULL); + radeon_crtc->cursor_offset = + radeon_allocate_memory(pScrn, &radeon_crtc->cursor_mem, size_bytes, align); - if (!fbarea) { - cursor_offset = 0; - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Hardware cursor disabled" - " due to insufficient offscreen memory\n"); + if (radeon_crtc->cursor_offset == 0) return FALSE; - } else { - cursor_offset = RADEON_ALIGN((fbarea->box.x1 + - fbarea->box.y1 * width) * - info->CurrentLayout.pixel_bytes, - align); - for (c = 0; c < xf86_config->num_crtc; c++) { - xf86CrtcPtr crtc = xf86_config->crtc[c]; - RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private; - - radeon_crtc->cursor_offset = cursor_offset + (c * size_bytes); - - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Using hardware cursor %d (scanline %u)\n", c, - (unsigned)(radeon_crtc->cursor_offset / pScrn->displayWidth - / info->CurrentLayout.pixel_bytes)); - } - - } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Will use %d kb for hardware cursor %d at offset 0x%08x\n", + (size_bytes * xf86_config->num_crtc) / 1024, + c, + (unsigned int)radeon_crtc->cursor_offset); } -#endif return xf86_cursors_init (pScreen, CURSOR_WIDTH, CURSOR_HEIGHT, (HARDWARE_CURSOR_TRUECOLOR_AT_8BPP | |