[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/13] tcx: alter tcx24_reset_dirty() to accept a
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCH v2 07/13] tcx: alter tcx24_reset_dirty() to accept address and length parameters |
Date: |
Fri, 21 Apr 2017 09:28:41 +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 | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index 171236a..e9056e0 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -123,22 +123,16 @@ static int tcx_check_dirty(TCXState *s, ram_addr_t addr,
int len)
return ret;
}
-static inline void tcx24_reset_dirty(TCXState *ts, ram_addr_t page_min,
- ram_addr_t page_max, ram_addr_t page24,
- ram_addr_t cpage)
+static void tcx_reset_dirty(TCXState *s, ram_addr_t addr, int len)
{
- memory_region_reset_dirty(&ts->vram_mem,
- page_min,
- (page_max - page_min) + TARGET_PAGE_SIZE,
- DIRTY_MEMORY_VGA);
- memory_region_reset_dirty(&ts->vram_mem,
- page24 + page_min * 4,
- (page_max - page_min) * 4 + TARGET_PAGE_SIZE,
- DIRTY_MEMORY_VGA);
- memory_region_reset_dirty(&ts->vram_mem,
- cpage + page_min * 4,
- (page_max - page_min) * 4 + TARGET_PAGE_SIZE,
- DIRTY_MEMORY_VGA);
+ 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)
@@ -428,10 +422,7 @@ static void tcx_update_display(void *opaque)
}
/* reset modified pages */
if (page_max >= page_min) {
- memory_region_reset_dirty(&ts->vram_mem,
- page_min,
- (page_max - page_min) + TARGET_PAGE_SIZE,
- DIRTY_MEMORY_VGA);
+ tcx_reset_dirty(ts, page_min, page_max - page_min);
}
}
@@ -528,7 +519,7 @@ static void tcx24_update_display(void *opaque)
}
/* reset modified pages */
if (page_max >= page_min) {
- tcx24_reset_dirty(ts, page_min, page_max, page24, cpage);
+ tcx_reset_dirty(ts, page_min, page_max - 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, 2017/04/21
- [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 <=
- [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
- [Qemu-devel] [PATCH v2 13/13] tcx: switch to load_image_mr() and remove prom_addr hack, Mark Cave-Ayland, 2017/04/21