This completes the decoupling from the ATIVGAState struct.

Signed-off-by: Chad Jablonski <chad@jablonski.xyz>
---
 hw/display/ati_2d.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c
index 8397a4d1bb..e1e48ac81f 100644
--- a/hw/display/ati_2d.c
+++ b/hw/display/ati_2d.c
@@ -121,7 +121,7 @@ static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2DCtx *ctx)
             (ctx->top_to_bottom ? 'v' : '^'));
 }
 
-static void ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx, uint8_t use_pixman)
+static void ati_2d_do_blt(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: */
@@ -269,13 +269,12 @@ static void ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx, uint8_t use_pixman)
                       ctx->rop3 >> 16);
         return;
     }
-
-    ati_set_dirty(&s->vga, ctx);
 }
 
 void ati_2d_blt(ATIVGAState *s)
 {
     ATI2DCtx ctx;
     setup_2d_blt_ctx(s, &ctx);
-    ati_2d_do_blt(s, &ctx, s->use_pixman);
+    ati_2d_do_blt(&ctx, s->use_pixman);
+    ati_set_dirty(&s->vga, &ctx);
 }
-- 
2.52.0

On Mon, 2 Feb 2026, Chad Jablonski wrote:
> This completes the decoupling from the ATIVGAState struct.
>
> Signed-off-by: Chad Jablonski <chad@jablonski.xyz>
> ---
> hw/display/ati_2d.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c
> index 8397a4d1bb..e1e48ac81f 100644
> --- a/hw/display/ati_2d.c
> +++ b/hw/display/ati_2d.c
> @@ -121,7 +121,7 @@ static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2DCtx *ctx)
>             (ctx->top_to_bottom ? 'v' : '^'));
> }
>
> -static void ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx, uint8_t use_pixman)
> +static void ati_2d_do_blt(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: */
> @@ -269,13 +269,12 @@ static void ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx, uint8_t use_pixman)
>                       ctx->rop3 >> 16);
>         return;

This return is not needed any more

>     }
> -
> -    ati_set_dirty(&s->vga, ctx);

after moving ati_set_dirty to ati_2d_blt. This part moving ati_set_dirty 
could be squashed into patch 13 and the remaining two lines that remove 
ATIVGAState from ati_2d_do_blt can go into patch 14.

Regards,
BALATON Zoltan

> }
>
> void ati_2d_blt(ATIVGAState *s)
> {
>     ATI2DCtx ctx;
>     setup_2d_blt_ctx(s, &ctx);
> -    ati_2d_do_blt(s, &ctx, s->use_pixman);
> +    ati_2d_do_blt(&ctx, s->use_pixman);
> +    ati_set_dirty(&s->vga, &ctx);
> }
>