Implement flushing the 128-bit HOST_DATA accumulator to VRAM to enable text rendering in X. Supports all datatypes (monochrome frgd/bkgd, monochrome frgd, and color), however monochrome frgd support is partial and does not properly handle transparency/leave-alone.
The flush is broken up into two steps. First, if necessary, expansion of the monochrome bits to the destination color depth. Then the expanded pixels are sent to the ati_2d_do_blt one scanline at a time. ati_2d_do_blt then clips and performs the blit. Signed-off-by: Chad Jablonski <[email protected]> --- hw/display/ati.c | 5 +- hw/display/ati_2d.c | 126 ++++++++++++++++++++++++++++++++++++++++++ hw/display/ati_int.h | 2 + hw/display/ati_regs.h | 4 ++ 4 files changed, 134 insertions(+), 3 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 3757b8426e..4468c345b1 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -1038,7 +1038,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, s->host_data.acc[s->host_data.next] = data; if (s->host_data.next % ATI_HOST_DATA_FLUSH_WORDS == ATI_HOST_DATA_FLUSH_WORDS - 1) { - qemu_log_mask(LOG_UNIMP, "HOST_DATA flush not yet implemented\n"); + ati_flush_host_data(s); } s->host_data.next = (s->host_data.next + 1) % ARRAY_SIZE(s->host_data.acc); @@ -1048,8 +1048,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, break; } s->host_data.acc[s->host_data.next] = data; - qemu_log_mask(LOG_UNIMP, - "HOST_DATA finish flush not yet implemented\n"); + ati_finish_host_data(s); break; default: break; diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index 2b3a239da3..8de9d0f414 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -290,6 +290,19 @@ static void ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman) void ati_2d_blt(ATIVGAState *s) { ATI2DCtx ctx; + uint32_t src_source = s->regs.dp_mix & DP_SRC_SOURCE; + + /* Finish any active HOST_DATA blits before starting a new blit */ + ati_finish_host_data(s); + + if (src_source == DP_SRC_HOST || src_source == DP_SRC_HOST_BYTEALIGN) { + /* Begin a HOST_DATA blit */ + s->host_data.active = true; + s->host_data.next = 0; + s->host_data.col = 0; + s->host_data.row = 0; + return; + } setup_2d_blt_ctx(s, &ctx); if (ctx.rop3 == ROP3_SRCCOPY && (ctx.src.x > 0x3fff || ctx.src.y > 0x3fff || ctx.src_bits >= ctx.vram_end || ctx.src_bits + ctx.src.x + @@ -300,3 +313,116 @@ void ati_2d_blt(ATIVGAState *s) ati_2d_do_blt(&ctx, s->use_pixman); ati_set_dirty(&s->vga, &ctx); } + +bool ati_flush_host_data(ATIVGAState *s) +{ + ATI2DCtx ctx, chunk; + uint32_t fg = s->regs.dp_src_frgd_clr; + uint32_t bg = s->regs.dp_src_bkgd_clr; + unsigned bypp, pix_count, row, col, base, idx; + uint8_t pix_buf[ATI_HOST_DATA_FLUSH_BITS * sizeof(uint32_t)]; + uint32_t byte_pix_order = s->regs.dp_datatype & DP_BYTE_PIX_ORDER; + uint32_t src_source = s->regs.dp_mix & DP_SRC_SOURCE; + uint32_t src_datatype = s->regs.dp_datatype & DP_SRC_DATATYPE; + + if (!s->host_data.active) { + return false; + } + if (src_source != DP_SRC_HOST) { + qemu_log_mask(LOG_GUEST_ERROR, + "host_data_blt: unsupported src_source %x\n", src_source); + return false; + } + if (src_datatype != SRC_MONO_FRGD_BKGD && src_datatype != SRC_MONO_FRGD && + src_datatype != SRC_COLOR) { + qemu_log_mask(LOG_GUEST_ERROR, + "host_data_blt: undefined src_datatype %x\n", + src_datatype); + return false; + } + + setup_2d_blt_ctx(s, &ctx); + + if (!ctx.left_to_right || !ctx.top_to_bottom) { + qemu_log_mask(LOG_UNIMP, + "host_data_blt: unsupported blit direction %c%c\n", + ctx.left_to_right ? '>' : '<', + ctx.top_to_bottom ? 'v' : '^'); + return false; + } + + bypp = ctx.bpp / 8; + base = (s->host_data.next / ATI_HOST_DATA_FLUSH_WORDS) * + ATI_HOST_DATA_FLUSH_WORDS; + DPRINTF("expand @ base: %d\n", base); + + if (src_datatype == SRC_COLOR) { + pix_count = ATI_HOST_DATA_FLUSH_BITS / ctx.bpp; + memcpy(pix_buf, &s->host_data.acc[base], + ATI_HOST_DATA_FLUSH_WORDS * sizeof(uint32_t)); + } else { + pix_count = ATI_HOST_DATA_FLUSH_BITS; + /* Expand monochrome bits to color pixels */ + idx = 0; + for (int word = base; word < base + ATI_HOST_DATA_FLUSH_WORDS; word++) { + for (int byte = 0; byte < 4; byte++) { + uint8_t byte_val = s->host_data.acc[word] >> (byte * 8); + for (int i = 0; i < 8; i++) { + bool is_fg = byte_val & BIT(byte_pix_order ? i : 7 - i); + uint32_t color = is_fg ? fg : bg; + stn_he_p(&pix_buf[idx * bypp], bypp, color); + idx += 1; + } + } + } + } + + /* Copy and then modify blit ctx for use in a chunked blit */ + chunk = ctx; + chunk.src_bits = pix_buf; + chunk.src.y = 0; + chunk.src_stride = ATI_HOST_DATA_FLUSH_BITS * bypp; + + /* Blit one scanline chunk at a time */ + row = s->host_data.row; + col = s->host_data.col; + idx = 0; + DPRINTF("blt %dpx @ row: %d, col: %d\n", pix_count, row, col); + while (idx < pix_count && row < ctx.dst.height) { + unsigned pix_in_scanline = MIN(pix_count - idx, + ctx.dst.width - col); + chunk.src.x = idx; + /* Build a rect for this scanline chunk */ + chunk.dst.x = ctx.dst.x + col; + chunk.dst.y = ctx.dst.y + row; + chunk.dst.width = pix_in_scanline; + chunk.dst.height = 1; + DPRINTF("blt %dpx span @ row: %d, col: %d to dst (%d,%d)\n", + pix_in_scanline, row, col, chunk.dst.x, chunk.dst.y); + ati_2d_do_blt(&chunk, s->use_pixman); + ati_set_dirty(&s->vga, &chunk); + idx += pix_in_scanline; + col += pix_in_scanline; + if (col >= ctx.dst.width) { + col = 0; + row += 1; + } + } + + /* Track state of the overall blit for use by the next flush */ + s->host_data.row = row; + s->host_data.col = col; + if (s->host_data.row >= ctx.dst.height) { + s->host_data.active = false; + } + + return s->host_data.active; +} + +void ati_finish_host_data(ATIVGAState *s) +{ + while (ati_flush_host_data(s)) { + s->host_data.next = (s->host_data.next + ATI_HOST_DATA_FLUSH_WORDS) % + ARRAY_SIZE(s->host_data.acc); + } +} diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index b285b6eba5..9e77bf8ebd 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -128,5 +128,7 @@ struct ATIVGAState { const char *ati_reg_name(int num); void ati_2d_blt(ATIVGAState *s); +bool ati_flush_host_data(ATIVGAState *s); +void ati_finish_host_data(ATIVGAState *s); #endif /* ATI_INT_H */ diff --git a/hw/display/ati_regs.h b/hw/display/ati_regs.h index 48f15e9b1d..b813fa119e 100644 --- a/hw/display/ati_regs.h +++ b/hw/display/ati_regs.h @@ -397,7 +397,11 @@ #define DST_32BPP 0x00000006 #define DP_DST_DATATYPE 0x0000000f #define DP_BRUSH_DATATYPE 0x00000f00 +#define SRC_MONO_FRGD_BKGD 0x00000000 +#define SRC_MONO_FRGD 0x00010000 +#define SRC_COLOR 0x00030000 #define DP_SRC_DATATYPE 0x00030000 +#define DP_BYTE_PIX_ORDER 0x40000000 #define BRUSH_SOLIDCOLOR 0x00000d00 -- 2.52.0
