starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

hw/display/ati: Include vga state in the blit context

Browse Source 
The vga state is needed by several functions using the blit context so
just include it in the context instead of passing it separately.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Chad Jablonski <chad@jablonski.xyz>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Message-ID: <20260619140408.6CF98596948@zero.eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
This commit is contained in:
BALATON Zoltan
2026-06-19 16:04:08 +02:00
committed by Philippe Mathieu-Daudé
parent cb7bc10385
commit 5ccef75fa2
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
hw/display/ati_2d.c
View File

@@ -45,6 +45,7 @@ static int ati_bpp_from_datatype(const ATIVGAState *s)
}
typedef struct {
VGACommonState *vga;
int bpp;
uint32_t rop3;
bool host_data_active;
@@ -52,8 +53,6 @@ typedef struct {
bool top_to_bottom;
bool need_swap;
uint32_t frgd_clr;
const uint8_t *palette;
const uint8_t *vram_end;
QemuRect scissor;
QemuRect dst;
@@ -66,8 +65,9 @@ typedef struct {
const uint8_t *src_bits;
} ATI2DCtx;
static void ati_set_dirty(VGACommonState *vga, const ATI2DCtx *ctx)
static void ati_set_dirty(const ATI2DCtx *ctx)
{
VGACommonState *vga = ctx->vga;
DisplaySurface *ds = qemu_console_surface(vga->con);
unsigned int bypp = ctx->bpp / 8;
hwaddr dirty_start = ctx->dst_offset + ctx->dst.x * bypp +
@@ -94,8 +94,9 @@ static void ati_set_dirty(VGACommonState *vga, const ATI2DCtx *ctx)
}
}
static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2DCtx *ctx)
static void setup_2d_blt_ctx(ATIVGAState *s, ATI2DCtx *ctx)
{
ctx->vga = &s->vga;
ctx->bpp = ati_bpp_from_datatype(s);
ctx->rop3 = s->regs.dp_mix & GMC_ROP3_MASK;
ctx->host_data_active = s->host_data.active;
@@ -103,9 +104,7 @@ static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2DCtx *ctx)
ctx->top_to_bottom = s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM;
ctx->need_swap = (HOST_BIG_ENDIAN != s->vga.big_endian_fb);
ctx->frgd_clr = s->regs.dp_brush_frgd_clr;
ctx->palette = s->vga.palette;
ctx->dst_offset = s->regs.dst_offset;
ctx->vram_end = s->vga.vram_ptr + s->vga.vram_size;
ctx->scissor.width = s->regs.sc_right - s->regs.sc_left + 1;
ctx->scissor.height = s->regs.sc_bottom - s->regs.sc_top + 1;
@@ -153,10 +152,11 @@ static uint32_t make_filler(int bpp, uint32_t color)
return color;
}
static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)
static bool ati_2d_do_blt(const ATI2DCtx *ctx, uint8_t use_pixman)
{
QemuRect vis_src, vis_dst;
unsigned int x, y, i, j, bypp = ctx->bpp / 8;
const uint8_t *vram_end = ctx->vga->vram_ptr + ctx->vga->vram_size;
if (!ctx->bpp) {
qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n");
@@ -167,9 +167,8 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)
return false;
}
if (ctx->dst.x > 0x3fff || ctx->dst.y > 0x3fff ||
ctx->dst_bits >= ctx->vram_end - bypp ||
ctx->dst_bits + ctx->dst.x * bypp + (ctx->dst.y + ctx->dst.height) *
ctx->dst_stride >= ctx->vram_end - bypp) {
ctx->dst_bits >= vram_end - bypp || ctx->dst_bits + ctx->dst.x * bypp +
(ctx->dst.y + ctx->dst.height) * ctx->dst_stride >= vram_end - bypp) {
qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n");
return false;
}
@@ -206,9 +205,9 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)
}
if (!ctx->host_data_active &&
(vis_src.x > 0x3fff || vis_src.y > 0x3fff ||
ctx->src_bits >= ctx->vram_end - bypp ||
ctx->src_bits >= vram_end - bypp ||
ctx->src_bits + vis_src.x * bypp + (vis_src.y + vis_dst.height) *
ctx->src_stride >= ctx->vram_end - bypp)) {
ctx->src_stride >= vram_end - bypp)) {
qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n");
return false;
}
@@ -275,6 +274,7 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)
case ROP3_BLACKNESS:
case ROP3_WHITENESS:
{
const uint8_t *palette = ctx->vga->palette;
uint32_t filler = 0;
if (ctx->bpp == 24) {
@@ -286,14 +286,12 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)
filler = make_filler(ctx->bpp, ctx->frgd_clr);
break;
case ROP3_BLACKNESS:
filler = 0xffUL << 24 | rgb_to_pixel32(ctx->palette[0],
ctx->palette[1],
ctx->palette[2]);
filler = 0xffUL << 24 | rgb_to_pixel32(palette[0], palette[1],
palette[2]);
break;
case ROP3_WHITENESS:
filler = 0xffUL << 24 | rgb_to_pixel32(ctx->palette[3],
ctx->palette[4],
ctx->palette[5]);
filler = 0xffUL << 24 | rgb_to_pixel32(palette[3], palette[4],
palette[5]);
break;
}
DPRINTF("pixman_fill(%p, %ld, %d, %d, %d, %d, %d, %x)\n",
@@ -347,7 +345,7 @@ void ati_2d_blt(ATIVGAState *s)
}
setup_2d_blt_ctx(s, &ctx);
if (ati_2d_do_blt(&ctx, s->use_pixman)) {
ati_set_dirty(&s->vga, &ctx);
ati_set_dirty(&ctx);
}
}
@@ -446,7 +444,7 @@ bool ati_host_data_flush(ATIVGAState *s)
DPRINTF("blt %dpx span @ row: %d, col: %d to dst (%d,%d)\n",
pix_in_scanline, row, col, chunk.dst.x, chunk.dst.y);
if (ati_2d_do_blt(&chunk, s->use_pixman)) {
ati_set_dirty(&s->vga, &chunk);
ati_set_dirty(&chunk);
}
idx += pix_in_scanline;
col += pix_in_scanline;