Re: [PATCH v6 15/20] ati-vga: Extract ati_set_dirty helper function

[BALATON Zoltan]

On Fri, 30 Jan 2026, Chad Jablonski wrote:
This is done in preparation for the removal of the ATIVGAState *s
parameter. It will also be used by the HOST_DATA implementation.
Signed-off-by: Chad Jablonski <c...@jablonski.xyz>
---
hw/display/ati_2d.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c
index 39ea67aeb7..5c15c3ec70 100644
--- a/hw/display/ati_2d.c
+++ b/hw/display/ati_2d.c
@@ -64,6 +64,19 @@ typedef struct {
    const uint8_t *src_bits;
} ATI2DCtx;

+static void ati_set_dirty(VGACommonState *vga, const ATI2DCtx *ctx)
+{
+    DisplaySurface *ds = qemu_console_surface(vga->con);
+    unsigned dst_offset = ctx->dst_bits - vga->vram_ptr;
+    if (ctx->dst_bits >= vga->vram_ptr + vga->vbe_start_addr &&
+        ctx->dst_bits < vga->vram_ptr + vga->vbe_start_addr +
+        vga->vbe_regs[VBE_DISPI_INDEX_YRES] * vga->vbe_line_offset) {
+        memory_region_set_dirty(&vga->vram, vga->vbe_start_addr +
+                                dst_offset + ctx->dst.y * surface_stride(ds),
+                                ctx->dst.height * surface_stride(ds));
+    }
+}

Could this be done in patch 8 when consolidating the duplicate? That seems 
to be a good place to also introduce this function.

Regards,
BALATON Zoltan

+
static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2DCtx *ctx)
{
    ctx->bpp = ati_bpp_from_datatype(s);
@@ -105,14 +118,12 @@ static void ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx, 
uint8_t use_pixman)
{
    /* FIXME it is probably more complex than this and may need to be */
    /* rewritten but for now as a start just to get some output: */
-    DisplaySurface *ds = qemu_console_surface(s->vga.con);
    bool use_pixman_fill = use_pixman & BIT(0);
    bool use_pixman_blt = use_pixman & BIT(1);
    DPRINTF("%p %u ds: %p %d %d rop: %x\n", s->vga.vram_ptr,
            s->vga.vbe_start_addr, surface_data(ds), surface_stride(ds),
            surface_bits_per_pixel(ds),
            ctx->rop3 >> 16);
-    unsigned dst_offset = s->regs.dst_offset;
    if (!ctx->bpp) {
        qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n");
        return;
@@ -261,14 +272,6 @@ static void ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx, 
uint8_t use_pixman)
                      ctx->rop3 >> 16);
        return;
    }
-
-    if (ctx->dst_bits >= s->vga.vram_ptr + s->vga.vbe_start_addr &&
-        ctx->dst_bits < s->vga.vram_ptr + s->vga.vbe_start_addr +
-        s->vga.vbe_regs[VBE_DISPI_INDEX_YRES] * s->vga.vbe_line_offset) {
-        memory_region_set_dirty(&s->vga.vram, s->vga.vbe_start_addr +
-                                dst_offset + ctx->dst.y * surface_stride(ds),
-                                ctx->dst.height * surface_stride(ds));
-    }
}

void ati_2d_blt(ATIVGAState *s)
@@ -276,4 +279,5 @@ void ati_2d_blt(ATIVGAState *s)
    ATI2DCtx ctx;
    setup_2d_blt_ctx(s, &ctx);
    ati_2d_do_blt(s, &ctx, s->use_pixman);
+    ati_set_dirty(&s->vga, &ctx);
}