Commit 2dd285b5 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by Gerd Hoffmann
Browse files

tcx: make display updates thread safe 



Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-id: 1494449551-20227-3-git-send-email-mark.cave-ayland@ilande.co.uk
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 344a68bf

hw/display/tcx.c

+24 −44
Original line number Diff line number Diff line
@@ -104,36 +104,23 @@ static void tcx_set_dirty(TCXState *s, ram_addr_t addr, int len) 
    }

}



static int tcx_check_dirty(TCXState *s, ram_addr_t addr, int len)

static int tcx_check_dirty(TCXState *s, DirtyBitmapSnapshot *snap,

                           ram_addr_t addr, int len)

{

    int ret;



    ret = memory_region_get_dirty(&s->vram_mem, addr, len, DIRTY_MEMORY_VGA);

    ret = memory_region_snapshot_get_dirty(&s->vram_mem, snap, addr, len);



    if (s->depth == 24) {

        ret |= memory_region_get_dirty(&s->vram_mem,

                                       s->vram24_offset + addr * 4, len * 4,

                                       DIRTY_MEMORY_VGA);

        ret |= memory_region_get_dirty(&s->vram_mem,

                                       s->cplane_offset + addr * 4, len * 4,

                                       DIRTY_MEMORY_VGA);

        ret |= memory_region_snapshot_get_dirty(&s->vram_mem, snap,

                                       s->vram24_offset + addr * 4, len * 4);

        ret |= memory_region_snapshot_get_dirty(&s->vram_mem, snap,

                                       s->cplane_offset + addr * 4, len * 4);

    }



    return ret;

}



static void tcx_reset_dirty(TCXState *s, ram_addr_t addr, int len)

{

    memory_region_reset_dirty(&s->vram_mem, addr, len, DIRTY_MEMORY_VGA);



    if (s->depth == 24) {

        memory_region_reset_dirty(&s->vram_mem, s->vram24_offset + addr * 4,

                                  len * 4, DIRTY_MEMORY_VGA);

        memory_region_reset_dirty(&s->vram_mem, s->cplane_offset + addr * 4,

                                  len * 4, DIRTY_MEMORY_VGA);

    }

}



static void update_palette_entries(TCXState *s, int start, int end)

{

    DisplaySurface *surface = qemu_console_surface(s->con);
@@ -233,7 +220,8 @@ static void tcx_update_display(void *opaque) 
{

    TCXState *ts = opaque;

    DisplaySurface *surface = qemu_console_surface(ts->con);

    ram_addr_t page, page_min, page_max;

    ram_addr_t page;

    DirtyBitmapSnapshot *snap = NULL;

    int y, y_start, dd, ds;

    uint8_t *d, *s;
@@ -243,22 +231,20 @@ static void tcx_update_display(void *opaque) 


    page = 0;

    y_start = -1;

    page_min = -1;

    page_max = 0;

    d = surface_data(surface);

    s = ts->vram;

    dd = surface_stride(surface);

    ds = 1024;



    memory_region_sync_dirty_bitmap(&ts->vram_mem);

    snap = memory_region_snapshot_and_clear_dirty(&ts->vram_mem, 0x0,

                                             memory_region_size(&ts->vram_mem),

                                             DIRTY_MEMORY_VGA);



    for (y = 0; y < ts->height; y++, page += ds) {

        if (tcx_check_dirty(ts, page, ds)) {

        if (tcx_check_dirty(ts, snap, page, ds)) {

            if (y_start < 0)

                y_start = y;

            if (page < page_min)

                page_min = page;

            if (page > page_max)

                page_max = page;



            tcx_draw_line32(ts, d, s, ts->width);

            if (y >= ts->cursy && y < ts->cursy + 32 && ts->cursx < ts->width) {
@@ -280,17 +266,15 @@ static void tcx_update_display(void *opaque) 
        dpy_gfx_update(ts->con, 0, y_start,

                       ts->width, y - y_start);

    }

    /* reset modified pages */

    if (page_max >= page_min) {

        tcx_reset_dirty(ts, page_min, page_max - page_min);

    }

    g_free(snap);

}



static void tcx24_update_display(void *opaque)

{

    TCXState *ts = opaque;

    DisplaySurface *surface = qemu_console_surface(ts->con);

    ram_addr_t page, page_min, page_max;

    ram_addr_t page;

    DirtyBitmapSnapshot *snap = NULL;

    int y, y_start, dd, ds;

    uint8_t *d, *s;

    uint32_t *cptr, *s24;
@@ -301,8 +285,6 @@ static void tcx24_update_display(void *opaque) 


    page = 0;

    y_start = -1;

    page_min = -1;

    page_max = 0;

    d = surface_data(surface);

    s = ts->vram;

    s24 = ts->vram24;
@@ -311,14 +293,15 @@ static void tcx24_update_display(void *opaque) 
    ds = 1024;



    memory_region_sync_dirty_bitmap(&ts->vram_mem);

    snap = memory_region_snapshot_and_clear_dirty(&ts->vram_mem, 0x0,

                                             memory_region_size(&ts->vram_mem),

                                             DIRTY_MEMORY_VGA);



    for (y = 0; y < ts->height; y++, page += ds) {

        if (tcx_check_dirty(ts, page, ds)) {

        if (tcx_check_dirty(ts, snap, page, ds)) {

            if (y_start < 0)

                y_start = y;

            if (page < page_min)

                page_min = page;

            if (page > page_max)

                page_max = page;



            tcx24_draw_line32(ts, d, s, ts->width, cptr, s24);

            if (y >= ts->cursy && y < ts->cursy+32 && ts->cursx < ts->width) {

                tcx_draw_cursor32(ts, d, y, ts->width);
@@ -341,10 +324,7 @@ static void tcx24_update_display(void *opaque) 
        dpy_gfx_update(ts->con, 0, y_start,

                       ts->width, y - y_start);

    }

    /* reset modified pages */

    if (page_max >= page_min) {

        tcx_reset_dirty(ts, page_min, page_max - page_min);

    }

    g_free(snap);

}



static void tcx_invalidate_display(void *opaque)