Commit 747d7ad2 authored by BALATON Zoltan's avatar BALATON Zoltan Committed by Gerd Hoffmann
Browse files

ati-vga: Fix hardware cursor image offset 



The crtc_offset is not needed, cur_offset is relative to the start of
vram not the start of displayed area. This fixes broken pointer image
with MacOS that uses non-0 crtc_offset.

Signed-off-by: default avatarBALATON Zoltan <balaton@eik.bme.hu>
Message-id: e6acb1fa3ca980dc948045443e5986e2aa79bf7c.1565558093.git.balaton@eik.bme.hu
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 50bc6af5

hw/display/ati.c

+3 −5
Original line number Diff line number Diff line
@@ -132,9 +132,8 @@ static void ati_cursor_define(ATIVGAState *s) 
        return; /* Do not update cursor if locked or rendered by guest */

    }

    /* FIXME handle cur_hv_offs correctly */

    src = s->vga.vram_ptr + (s->regs.crtc_offset & 0x07ffffff) +

          s->regs.cur_offset - (s->regs.cur_hv_offs >> 16) -

          (s->regs.cur_hv_offs & 0xffff) * 16;

    src = s->vga.vram_ptr + s->regs.cur_offset -

          (s->regs.cur_hv_offs >> 16) - (s->regs.cur_hv_offs & 0xffff) * 16;

    for (i = 0; i < 64; i++) {

        for (j = 0; j < 8; j++, idx++) {

            data[idx] = src[i * 16 + j];
@@ -190,8 +189,7 @@ static void ati_cursor_draw_line(VGACommonState *vga, uint8_t *d, int scr_y) 
        return;

    }

    /* FIXME handle cur_hv_offs correctly */

    src = s->vga.vram_ptr + (s->regs.crtc_offset & 0x07ffffff) +

          s->cursor_offset + (scr_y - vga->hw_cursor_y) * 16;

    src = s->vga.vram_ptr + s->cursor_offset + (scr_y - vga->hw_cursor_y) * 16;

    dp = &dp[vga->hw_cursor_x];

    h = ((s->regs.crtc_h_total_disp >> 16) + 1) * 8;

    for (i = 0; i < 8; i++) {