From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Igor Mitsyanko <i.mitsyanko@gmail.com>,
Alistair Francis <alistair@alistair23.me>,
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
Gerd Hoffmann <kraxel@redhat.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Subject: [PULL 20/21] sm501: Optimize small overlapping blits
Date: Thu, 28 May 2020 14:36:08 +0200 [thread overview]
Message-ID: <20200528123609.27362-21-kraxel@redhat.com> (raw)
In-Reply-To: <20200528123609.27362-1-kraxel@redhat.com>
From: BALATON Zoltan <balaton@eik.bme.hu>
AmigaOS tends to do a lot of small blits (even 1 pixel). Avoid malloc
overhead by keeping around a buffer for this and only alloc when
blitting larger areas.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-id: 7946852258d528497e85f465327fc90b5c3b59fb.1590089984.git.balaton@eik.bme.hu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/sm501.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 8bf4d111f4b3..e7a9f77de7bc 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -750,6 +750,7 @@ static void sm501_2d_operation(SM501State *s)
switch (cmd) {
case 0: /* BitBlt */
{
+ static uint32_t tmp_buf[16384];
unsigned int src_x = (s->twoD_source >> 16) & 0x01FFF;
unsigned int src_y = s->twoD_source & 0xFFFF;
uint32_t src_base = s->twoD_source_base & 0x03FFFFFF;
@@ -812,10 +813,14 @@ static void sm501_2d_operation(SM501State *s)
de = db + width + height * (width + dst_pitch);
if (rtl && ((db >= sb && db <= se) || (de >= sb && de <= se))) {
/* regions may overlap: copy via temporary */
- int llb = width * (1 << format);
+ int free_buf = 0, llb = width * (1 << format);
int tmp_stride = DIV_ROUND_UP(llb, sizeof(uint32_t));
- uint32_t *tmp = g_malloc(tmp_stride * sizeof(uint32_t) *
- height);
+ uint32_t *tmp = tmp_buf;
+
+ if (tmp_stride * sizeof(uint32_t) * height > sizeof(tmp_buf)) {
+ tmp = g_malloc(tmp_stride * sizeof(uint32_t) * height);
+ free_buf = 1;
+ }
pixman_blt((uint32_t *)&s->local_mem[src_base], tmp,
src_pitch * (1 << format) / sizeof(uint32_t),
tmp_stride, 8 * (1 << format), 8 * (1 << format),
@@ -825,7 +830,9 @@ static void sm501_2d_operation(SM501State *s)
dst_pitch * (1 << format) / sizeof(uint32_t),
8 * (1 << format), 8 * (1 << format),
0, 0, dst_x, dst_y, width, height);
- g_free(tmp);
+ if (free_buf) {
+ g_free(tmp);
+ }
} else {
pixman_blt((uint32_t *)&s->local_mem[src_base],
(uint32_t *)&s->local_mem[dst_base],
--
2.18.4
next prev parent reply other threads:[~2020-05-28 12:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 12:35 [PULL 00/21] Vga 20200528 patches Gerd Hoffmann
2020-05-28 12:35 ` [PULL 01/21] hw/display/edid: Add missing 'qdev-properties.h' header Gerd Hoffmann
2020-05-28 12:35 ` [PULL 02/21] hw/display/cg3: Convert debug printf()s to trace events Gerd Hoffmann
2020-05-28 12:35 ` [PULL 03/21] hw/display/cirrus_vga: Convert debug printf() to trace event Gerd Hoffmann
2020-05-28 12:35 ` [PULL 04/21] hw/display/cirrus_vga: Use qemu_log_mask(UNIMP) instead of debug printf Gerd Hoffmann
2020-05-28 12:35 ` [PULL 05/21] hw/display/cirrus_vga: Use qemu_log_mask(ERROR) " Gerd Hoffmann
2020-05-28 12:35 ` [PULL 06/21] hw/display/cirrus_vga: Convert debug printf() to trace event Gerd Hoffmann
2020-05-28 12:35 ` [PULL 07/21] hw/display/dpcd: Fix memory region size Gerd Hoffmann
2020-05-28 12:35 ` [PULL 08/21] hw/display/dpcd: Convert debug printf()s to trace events Gerd Hoffmann
2020-05-28 12:35 ` [PULL 09/21] hw/display/xlnx_dp: Replace disabled DPRINTF() by error_report() Gerd Hoffmann
2020-05-28 12:35 ` [PULL 10/21] hw/display/vmware_vga: Replace printf() calls by qemu_log_mask(ERROR) Gerd Hoffmann
2020-05-28 12:35 ` [PULL 11/21] hw/display/vmware_vga: Let the PCI device own its I/O MemoryRegion Gerd Hoffmann
2020-05-28 12:36 ` [PULL 12/21] hw/display/exynos4210_fimd: Use qemu_log_mask(GUEST_ERROR) Gerd Hoffmann
2020-05-28 12:36 ` [PULL 13/21] hw/display/omap_dss: Replace fprintf() call by qemu_log_mask(LOG_UNIMP) Gerd Hoffmann
2020-05-28 12:36 ` [PULL 14/21] hw/display/pxa2xx_lcd: Replace printf() call by qemu_log_mask() Gerd Hoffmann
2020-05-28 12:36 ` [PULL 15/21] sm501: Convert printf + abort to qemu_log_mask Gerd Hoffmann
2020-05-28 12:36 ` [PULL 16/21] sm501: Shorten long variable names in sm501_2d_operation Gerd Hoffmann
2020-05-28 12:36 ` [PULL 17/21] sm501: Use BIT(x) macro to shorten constant Gerd Hoffmann
2020-05-28 12:36 ` [PULL 18/21] sm501: Clean up local variables in sm501_2d_operation Gerd Hoffmann
2020-05-28 12:36 ` [PULL 19/21] sm501: Replace hand written implementation with pixman where possible Gerd Hoffmann
2020-05-28 12:36 ` Gerd Hoffmann [this message]
2020-05-28 12:36 ` [PULL 21/21] sm501: Remove obsolete changelog and todo comment Gerd Hoffmann
2020-05-28 19:25 ` [PULL 00/21] Vga 20200528 patches no-reply
2020-05-29 10:29 ` Peter Maydell
2020-05-29 16:15 ` Philippe Mathieu-Daudé
2020-05-29 16:36 ` Peter Maydell
2020-05-29 16:47 ` Philippe Mathieu-Daudé
2020-06-02 9:48 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200528123609.27362-21-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=alistair@alistair23.me \
--cc=edgar.iglesias@gmail.com \
--cc=i.mitsyanko@gmail.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).