From nobody Mon Feb 9 15:56:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=jablonski.xyz ARC-Seal: i=1; a=rsa-sha256; t=1768531467; cv=none; d=zohomail.com; s=zohoarc; b=guunfMFaCcTxiR+79ak3zKUvxs0KYvhUw+dBamGWHW0OAq2sLnHQJVhbF/iTL7NwsO9eXC/6fxJAYkB4E6qsIEZPscT3bx289JXohxzYRTJx/cnULZtlgP5AGVe3FGOKFyJLOHjFSvAUXVnZ6hmSOCEf5nqQwgVMkx3QEBdprpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768531467; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xcGTQxYooEV7acDTJpYUIDY2KtNsL1X3AN5+oPbdfcs=; b=nxYYVg+Vw21wgFc6hO3Px4k4NU6diIwjXNJYz3IP+U1kKTGhN/nlF7sTOUMwFMqeVbEc4G9BUoathcogVpasZNLPAaKf+aQn4NLDl7jarWdi2cJg2pF4JtiKCkta43czxPMh4zFOpmqBMOcj2GQ+T5rBjSdKXJTS5Wngkg7EJ60= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768531467043287.6078815933372; Thu, 15 Jan 2026 18:44:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgZoR-0005xr-M4; Thu, 15 Jan 2026 21:43:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vgZnx-0005qN-Mx for qemu-devel@nongnu.org; Thu, 15 Jan 2026 21:43:22 -0500 Received: from fout-b8-smtp.messagingengine.com ([202.12.124.151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vgZnu-0002Qt-0m for qemu-devel@nongnu.org; Thu, 15 Jan 2026 21:43:17 -0500 Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfout.stl.internal (Postfix) with ESMTP id 5F1071D0007F; Thu, 15 Jan 2026 21:43:12 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Thu, 15 Jan 2026 21:43:12 -0500 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 15 Jan 2026 21:43:11 -0500 (EST) Received: from localhost (chomposaur [local]) by chomposaur (OpenSMTPD) with ESMTPA id 8f6fe13e; Fri, 16 Jan 2026 02:43:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jablonski.xyz; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1768531392; x= 1768617792; bh=xcGTQxYooEV7acDTJpYUIDY2KtNsL1X3AN5+oPbdfcs=; b=M iH8BikwgL+4h8ISvdwiS60gCxujnruCm8mYrGm/bT19cdcfe0peFWZrvf0DwCJyx uUNJiOROg4lIzp6NPALL77IDW2XYoT4JuZA+DV7oZb29cb8ibqn245nz5iaPMo2d iVSHxDXu2wavSVu19JTtMW1qklDnyuy6C2t2pQ8IudbdwuGIdIFfbCGwa0eZS3h0 Bmu+MDq+owxDVIvOxKzme0Y9M8KcIe1NxUielgJdjxgfqVhEhIoLzlW/YIEMmpOi tjEH0LBR6a+N0C3S33V7WTvdq9pZtYBJ7RZiiGkI6BYM2e3uL1IIu0zDGgKSj3Ob S3+MwRGmkgfAwAAt/L0eA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1768531392; x=1768617792; bh=x cGTQxYooEV7acDTJpYUIDY2KtNsL1X3AN5+oPbdfcs=; b=iMdt5huNZ5rZ0s8Cc VPEKjPTASzoLyaZQgySoBxrjIcC3Ex8NQgGM0R2v3XQoNWz7EZqtzjTvdUt4R/wK EjL+G7SSvIRPbdtihSkCLxwtHw192wMEpBmon3FYTDOpfXhMokuv8f7HSIIoDPEF WrSe0Pbclgqsz6Uilg/ftrRCnoY0oh74CY0ZexC/d5+Z0hOgGl//6VUq5wPDvEN3 bmBjdlI6fXPv3uKOkAh8deuESpKhfEMfYVGvxPeze1ByGybeAuGPBrzcaaPO4VeS uvzfFxVh/E9sJqQURlHKBGKeocMnIrVbq1DyrYrFY1vQ/NYTu2aCp14qyWx9fgSZ nDzIg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduvdejjeejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdljedtmdenucfjughrpefhvfevuf ffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeevhhgrugculfgrsghlohhnshhk ihcuoegthhgrugesjhgrsghlohhnshhkihdrgiihiieqnecuggftrfgrthhtvghrnhepgf eiteejhfelheefieetjefgleejfffhueffvdduieejgfeuueeuvddvkeejhfelnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghhrggusehjrg gslhhonhhskhhirdighiiipdhnsggprhgtphhtthhopeefpdhmohguvgepshhmthhpohhu thdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgpdhrtghpth htoheptghhrggusehjrggslhhonhhskhhirdighiiipdhrtghpthhtohepsggrlhgrthho nhesvghikhdrsghmvgdrhhhu X-ME-Proxy: Feedback-ID: ib26944c1:Fastmail From: Chad Jablonski To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu, Chad Jablonski Subject: [PATCH v5 06/12] ati-vga: Create setup_2d_blt_dst helper Date: Thu, 15 Jan 2026 21:42:52 -0500 Message-ID: <20260116024258.1487173-7-chad@jablonski.xyz> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20260116024258.1487173-1-chad@jablonski.xyz> References: <20260116024258.1487173-1-chad@jablonski.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=202.12.124.151; envelope-from=chad@jablonski.xyz; helo=fout-b8-smtp.messagingengine.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.499, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @jablonski.xyz) X-ZM-MESSAGEID: 1768531469205158500 Content-Type: text/plain; charset="utf-8" A large amount of the common setup involved in a blit deals with the destination. This moves that setup to a helper function which initializes a struct (ATIBltDst) holding all of the dst state. This setup will be shared between blits from memory as well as from HOST_DATA. Otherwise this is a pure refactor of the ati_2d_blt function to make use of the setup_2d_blt_dst helper and the struct it initializes. There should be no change in behavior in this patch. Signed-off-by: Chad Jablonski --- hw/display/ati_2d.c | 195 +++++++++++++++++++++++++------------------- 1 file changed, 112 insertions(+), 83 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index a8c4c534b9..75bd38e9b0 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -13,6 +13,7 @@ #include "qemu/log.h" #include "ui/pixel_ops.h" #include "ui/console.h" +#include "ui/rect.h" =20 /* * NOTE: @@ -24,7 +25,16 @@ * possible. */ =20 -static int ati_bpp_from_datatype(ATIVGAState *s) +typedef struct { + QemuRect rect; + int bpp; + int stride; + bool top_to_bottom; + bool left_to_right; + uint8_t *bits; +} ATIBltDst; + +static int ati_bpp_from_datatype(const ATIVGAState *s) { switch (s->regs.dp_datatype & 0xf) { case 2: @@ -43,57 +53,76 @@ static int ati_bpp_from_datatype(ATIVGAState *s) } } =20 +static void setup_2d_blt_dst(const ATIVGAState *s, ATIBltDst *dst) +{ + unsigned dst_x, dst_y; + dst->bpp =3D ati_bpp_from_datatype(s); + dst->stride =3D s->regs.dst_pitch; + dst->left_to_right =3D s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT; + dst->top_to_bottom =3D s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM; + dst->bits =3D s->vga.vram_ptr + s->regs.dst_offset; + dst_x =3D (dst->left_to_right ? + s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_width); + dst_y =3D (dst->top_to_bottom ? + s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_height); + qemu_rect_init(&dst->rect, dst_x, dst_y, + s->regs.dst_width, s->regs.dst_height); + if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { + dst->bits +=3D s->regs.crtc_offset & 0x07ffffff; + dst->stride *=3D dst->bpp; + } +} + void ati_2d_blt(ATIVGAState *s) { /* 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 =3D qemu_console_surface(s->vga.con); + uint8_t *end =3D s->vga.vram_ptr + s->vga.vram_size; + int dst_stride_words; + ATIBltDst _dst; /* TEMP: avoid churn in future patches */ + ATIBltDst *dst =3D &_dst; + 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), (s->regs.dp_mix & GMC_ROP3_MASK) >> 16); - unsigned dst_x =3D (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? - s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_widt= h); - unsigned dst_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? - s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_heig= ht); - int bpp =3D ati_bpp_from_datatype(s); - if (!bpp) { + + setup_2d_blt_dst(s, dst); + + if (!dst->bpp) { qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); return; } - int dst_stride =3D s->regs.dst_pitch; - if (!dst_stride) { + if (!dst->stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n"); return; } - uint8_t *dst_bits =3D s->vga.vram_ptr + s->regs.dst_offset; - - if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { - dst_bits +=3D s->regs.crtc_offset & 0x07ffffff; - dst_stride *=3D bpp; - } - uint8_t *end =3D s->vga.vram_ptr + s->vga.vram_size; - if (dst_x > 0x3fff || dst_y > 0x3fff || dst_bits >=3D end - || dst_bits + dst_x - + (dst_y + s->regs.dst_height) * dst_stride >=3D end) { + if (dst->rect.x > 0x3fff || dst->rect.y > 0x3fff || dst->bits >=3D end + || dst->bits + dst->rect.x + + (dst->rect.y + dst->rect.height) * dst->stride >=3D end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } + + dst_stride_words =3D dst->stride / sizeof(uint32_t); + DPRINTF("%d %d %d, %d %d %d, (%d,%d) -> (%d,%d) %dx%d %c %c\n", s->regs.src_offset, s->regs.dst_offset, s->regs.default_offset, - s->regs.src_pitch, s->regs.dst_pitch, s->regs.default_pitch, - s->regs.src_x, s->regs.src_y, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height, - (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? '>' : '<'), - (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? 'v' : '^')); + s->regs.src_pitch, dst->stride, s->regs.default_pitch, + s->regs.src_x, s->regs.src_y, dst->rect.x, dst->rect.y, + dst->rect.width, dst->rect.height, + (dst->left_to_right ? '>' : '<'), + (dst->top_to_bottom ? 'v' : '^')); + switch (s->regs.dp_mix & GMC_ROP3_MASK) { case ROP3_SRCCOPY: { bool fallback =3D false; - unsigned src_x =3D (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? - s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_wid= th); - unsigned src_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? - s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_hei= ght); + unsigned src_x =3D (dst->left_to_right ? + s->regs.src_x : s->regs.src_x + 1 - dst->rect.width= ); + unsigned src_y =3D (dst->top_to_bottom ? + s->regs.src_y : s->regs.src_y + 1 - dst->rect.heigh= t); int src_stride =3D s->regs.src_pitch; if (!src_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n"); @@ -103,44 +132,47 @@ void ati_2d_blt(ATIVGAState *s) =20 if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { src_bits +=3D s->regs.crtc_offset & 0x07ffffff; - src_stride *=3D bpp; + src_stride *=3D dst->bpp; } if (src_x > 0x3fff || src_y > 0x3fff || src_bits >=3D end || src_bits + src_x - + (src_y + s->regs.dst_height) * src_stride >=3D end) { + + (src_y + dst->rect.height) * src_stride >=3D end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } =20 src_stride /=3D sizeof(uint32_t); - dst_stride /=3D sizeof(uint32_t); DPRINTF("pixman_blt(%p, %p, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d= )\n", - src_bits, dst_bits, src_stride, dst_stride, bpp, bpp, - src_x, src_y, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height); + src_bits, dst->bits, + src_stride, dst_stride_words, + dst->bpp, dst->bpp, + src_x, src_y, dst->rect.x, dst->rect.y, + dst->rect.width, dst->rect.height); #ifdef CONFIG_PIXMAN if ((s->use_pixman & BIT(1)) && - s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT && - s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM) { - fallback =3D !pixman_blt((uint32_t *)src_bits, (uint32_t *)dst= _bits, - src_stride, dst_stride, bpp, bpp, - src_x, src_y, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height); + dst->left_to_right && dst->top_to_bottom) { + fallback =3D !pixman_blt((uint32_t *)src_bits, (uint32_t *)dst= ->bits, + src_stride, dst_stride_words, + dst->bpp, dst->bpp, + src_x, src_y, dst->rect.x, dst->rect.y, + dst->rect.width, dst->rect.height); } else if (s->use_pixman & BIT(1)) { /* FIXME: We only really need a temporary if src and dst overl= ap */ - int llb =3D s->regs.dst_width * (bpp / 8); + int llb =3D dst->rect.width * (dst->bpp / 8); int tmp_stride =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); uint32_t *tmp =3D g_malloc(tmp_stride * sizeof(uint32_t) * - s->regs.dst_height); + dst->rect.height); fallback =3D !pixman_blt((uint32_t *)src_bits, tmp, - src_stride, tmp_stride, bpp, bpp, + src_stride, tmp_stride, + dst->bpp, dst->bpp, src_x, src_y, 0, 0, - s->regs.dst_width, s->regs.dst_height); + dst->rect.width, dst->rect.height); if (!fallback) { - fallback =3D !pixman_blt(tmp, (uint32_t *)dst_bits, - tmp_stride, dst_stride, bpp, bpp, - 0, 0, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_heig= ht); + fallback =3D !pixman_blt(tmp, (uint32_t *)dst->bits, + tmp_stride, dst_stride_words, + dst->bpp, dst->bpp, + 0, 0, dst->rect.x, dst->rect.y, + dst->rect.width, dst->rect.height); } g_free(tmp); } else @@ -149,35 +181,33 @@ void ati_2d_blt(ATIVGAState *s) fallback =3D true; } if (fallback) { - unsigned int y, i, j, bypp =3D bpp / 8; + unsigned int y, i, j, bypp =3D dst->bpp / 8; unsigned int src_pitch =3D src_stride * sizeof(uint32_t); - unsigned int dst_pitch =3D dst_stride * sizeof(uint32_t); - - for (y =3D 0; y < s->regs.dst_height; y++) { - i =3D dst_x * bypp; + for (y =3D 0; y < dst->rect.height; y++) { + i =3D dst->rect.x * bypp; j =3D src_x * bypp; - if (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM) { - i +=3D (dst_y + y) * dst_pitch; + if (dst->top_to_bottom) { + i +=3D (dst->rect.y + y) * dst->stride; j +=3D (src_y + y) * src_pitch; } else { - i +=3D (dst_y + s->regs.dst_height - 1 - y) * dst_pitc= h; - j +=3D (src_y + s->regs.dst_height - 1 - y) * src_pitc= h; + i +=3D (dst->rect.y + dst->rect.height - 1 - y) * dst-= >stride; + j +=3D (src_y + dst->rect.height - 1 - y) * src_pitch; } - memmove(&dst_bits[i], &src_bits[j], s->regs.dst_width * by= pp); + memmove(&dst->bits[i], &src_bits[j], dst->rect.width * byp= p); } } - if (dst_bits >=3D s->vga.vram_ptr + s->vga.vbe_start_addr && - dst_bits < s->vga.vram_ptr + s->vga.vbe_start_addr + + if (dst->bits >=3D s->vga.vram_ptr + s->vga.vbe_start_addr && + 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 + s->regs.dst_offset + - dst_y * surface_stride(ds), - s->regs.dst_height * surface_stride(ds= )); + dst->rect.y * surface_stride(ds), + dst->rect.height * surface_stride(ds)); } - s->regs.dst_x =3D (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? - dst_x + s->regs.dst_width : dst_x); - s->regs.dst_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? - dst_y + s->regs.dst_height : dst_y); + s->regs.dst_x =3D (dst->left_to_right ? + dst->rect.x + dst->rect.width : dst->rect.x); + s->regs.dst_y =3D (dst->top_to_bottom ? + dst->rect.y + dst->rect.height : dst->rect.y); break; } case ROP3_PATCOPY: @@ -200,36 +230,35 @@ void ati_2d_blt(ATIVGAState *s) break; } =20 - dst_stride /=3D sizeof(uint32_t); DPRINTF("pixman_fill(%p, %d, %d, %d, %d, %d, %d, %x)\n", - dst_bits, dst_stride, bpp, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height, filler); + dst->bits, dst_stride_words, dst->bpp, dst->rect.x, dst->r= ect.y, + dst->rect.width, dst->rect.height, filler); #ifdef CONFIG_PIXMAN if (!(s->use_pixman & BIT(0)) || - !pixman_fill((uint32_t *)dst_bits, dst_stride, bpp, dst_x, dst= _y, - s->regs.dst_width, s->regs.dst_height, filler)) + !pixman_fill((uint32_t *)dst->bits, + dst_stride_words, dst->bpp, dst->rect.x, dst->rect.y, + dst->rect.width, dst->rect.height, filler)) #endif { /* fallback when pixman failed or we don't want to call it */ - unsigned int x, y, i, bypp =3D bpp / 8; - unsigned int dst_pitch =3D dst_stride * sizeof(uint32_t); - for (y =3D 0; y < s->regs.dst_height; y++) { - i =3D dst_x * bypp + (dst_y + y) * dst_pitch; - for (x =3D 0; x < s->regs.dst_width; x++, i +=3D bypp) { - stn_he_p(&dst_bits[i], bypp, filler); + unsigned int x, y, i, bypp =3D dst->bpp / 8; + for (y =3D 0; y < dst->rect.height; y++) { + i =3D dst->rect.x * bypp + (dst->rect.y + y) * dst->stride; + for (x =3D 0; x < dst->rect.width; x++, i +=3D bypp) { + stn_he_p(&dst->bits[i], bypp, filler); } } } - if (dst_bits >=3D s->vga.vram_ptr + s->vga.vbe_start_addr && - dst_bits < s->vga.vram_ptr + s->vga.vbe_start_addr + + if (dst->bits >=3D s->vga.vram_ptr + s->vga.vbe_start_addr && + 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 + s->regs.dst_offset + - dst_y * surface_stride(ds), - s->regs.dst_height * surface_stride(ds= )); + dst->rect.y * surface_stride(ds), + dst->rect.height * surface_stride(ds)); } - s->regs.dst_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? - dst_y + s->regs.dst_height : dst_y); + s->regs.dst_y =3D (dst->top_to_bottom ? + dst->rect.y + dst->rect.height : dst->rect.y); break; } default: --=20 2.51.2