[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/13] tcx: alter tcx24_check_dirty() to accept a
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCH v2 06/13] tcx: alter tcx24_check_dirty() to accept address and length parameters |
Date: |
Fri, 21 Apr 2017 09:28:40 +0100 |
This can now be used by both the 8-bit and 24-bit display code, so rename
to tcx_check_dirty().
Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
---
hw/display/tcx.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index 6817bd2..171236a 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -105,17 +105,21 @@ static void tcx_set_dirty(TCXState *s, ram_addr_t addr,
int len)
}
}
-static inline int tcx24_check_dirty(TCXState *s, ram_addr_t page,
- ram_addr_t page24, ram_addr_t cpage)
+static int tcx_check_dirty(TCXState *s, ram_addr_t addr, int len)
{
int ret;
- ret = memory_region_get_dirty(&s->vram_mem, page, TARGET_PAGE_SIZE,
- DIRTY_MEMORY_VGA);
- ret |= memory_region_get_dirty(&s->vram_mem, page24, TARGET_PAGE_SIZE * 4,
- DIRTY_MEMORY_VGA);
- ret |= memory_region_get_dirty(&s->vram_mem, cpage, TARGET_PAGE_SIZE * 4,
- DIRTY_MEMORY_VGA);
+ ret = memory_region_get_dirty(&s->vram_mem, addr, len, DIRTY_MEMORY_VGA);
+
+ 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);
+ }
+
return ret;
}
@@ -366,8 +370,7 @@ static void tcx_update_display(void *opaque)
memory_region_sync_dirty_bitmap(&ts->vram_mem);
for (y = 0; y < ts->height; page += TARGET_PAGE_SIZE) {
- if (memory_region_get_dirty(&ts->vram_mem, page, TARGET_PAGE_SIZE,
- DIRTY_MEMORY_VGA)) {
+ if (tcx_check_dirty(ts, page, TARGET_PAGE_SIZE)) {
if (y_start < 0)
y_start = y;
if (page < page_min)
@@ -461,7 +464,7 @@ static void tcx24_update_display(void *opaque)
memory_region_sync_dirty_bitmap(&ts->vram_mem);
for (y = 0; y < ts->height; page += TARGET_PAGE_SIZE,
page24 += TARGET_PAGE_SIZE, cpage += TARGET_PAGE_SIZE) {
- if (tcx24_check_dirty(ts, page, page24, cpage)) {
+ if (tcx_check_dirty(ts, page, TARGET_PAGE_SIZE)) {
if (y_start < 0)
y_start = y;
if (page < page_min)
--
1.7.10.4
- [Qemu-devel] [PATCH v2 00/13] TCX/CG3 adapter cleanups, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 09/13] tcx: remove TARGET_PAGE_SIZE from tcx_update_display(), Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 08/13] tcx: remove page24 and cpage from tcx24_update_display(), Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 02/13] cg3: fix up size parameter for memory_region_get_dirty(), Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 06/13] tcx: alter tcx24_check_dirty() to accept address and length parameters,
Mark Cave-Ayland <=
- [Qemu-devel] [PATCH v2 04/13] tcx: alter tcx_set_dirty() to accept address and length parameters, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 05/13] tcx: ensure tcx_set_dirty() also invalidates the 24-bit plane and cplane, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 07/13] tcx: alter tcx24_reset_dirty() to accept address and length parameters, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 01/13] cg3: remove TARGET_PAGE_SIZE rounding on dirty page detection, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 03/13] cg3: switch to load_image_mr() and remove prom-addr hack, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 11/13] tcx: remove primitives for non-32-bit surfaces, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 10/13] tcx: remove TARGET_PAGE_SIZE from tcx24_update_display(), Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 12/13] tcx: use tcx_set_dirty() for accelerated ops, Mark Cave-Ayland, 2017/04/21