From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH 6/9] hw/display/omap_lcdc: Drop broken bigendian ifdef
Date: Mon, 15 Feb 2021 10:32:12 +0000 [thread overview]
Message-ID: <20210215103215.4944-7-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210215103215.4944-1-peter.maydell@linaro.org>
The draw_line16_32() function in the omap_lcdc template header
includes an ifdef for the case where HOST_WORDS_BIGENDIAN matches
TARGET_WORDS_BIGENDIAN. This is trying to optimise for "source
bitmap and destination bitmap format match", but it is broken,
because in this function the formats don't match: the source is
16-bit colour and the destination is 32-bit colour, so a memcpy()
will produce corrupted graphics output. Drop the bogus ifdef.
This bug was introduced in commit ea644cf343129, when we dropped
support for DEPTH values other than 32 from the template header.
The old #if line was
#if DEPTH == 16 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
and this was mistakenly changed to
#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
rather than deleting the #if as now having an always-false condition.
Fixes: ea644cf343129
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/display/omap_lcd_template.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/hw/display/omap_lcd_template.h b/hw/display/omap_lcd_template.h
index c7c5025fb04..22e51d9bffb 100644
--- a/hw/display/omap_lcd_template.h
+++ b/hw/display/omap_lcd_template.h
@@ -139,9 +139,6 @@ static void draw_line12_32(void *opaque, uint8_t *d, const uint8_t *s,
static void draw_line16_32(void *opaque, uint8_t *d, const uint8_t *s,
int width, int deststep)
{
-#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
- memcpy(d, s, width * 2);
-#else
uint16_t v;
uint8_t r, g, b;
@@ -154,5 +151,4 @@ static void draw_line16_32(void *opaque, uint8_t *d, const uint8_t *s,
s += 2;
d += 4;
} while (-- width != 0);
-#endif
}
--
2.20.1
next prev parent reply other threads:[~2021-02-15 10:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 10:32 [PATCH 0/9] arm: drop dead code for non-32-bit-RGB surfaces Peter Maydell
2021-02-15 10:32 ` [PATCH 1/9] hw/arm/musicpal: Remove " Peter Maydell
2021-02-15 10:32 ` [PATCH 2/9] hw/display/tc6393xb: Remove dead code for handling non-32bpp surfaces Peter Maydell
2021-02-15 10:32 ` [PATCH 3/9] hw/display/tc6393xb: Expand out macros in template header Peter Maydell
2021-02-15 10:32 ` [PATCH 4/9] hw/display/tc6393xb: Inline tc6393xb_draw_graphic32() at its callsite Peter Maydell
2021-02-15 10:56 ` Philippe Mathieu-Daudé
2021-02-15 10:32 ` [PATCH 5/9] hw/display/omap_lcdc: Expand out macros in template header Peter Maydell
2021-02-15 10:32 ` Peter Maydell [this message]
2021-02-15 10:58 ` [PATCH 6/9] hw/display/omap_lcdc: Drop broken bigendian ifdef Philippe Mathieu-Daudé
2021-02-15 10:32 ` [PATCH 7/9] hw/display/omap_lcdc: Fix coding style issues in template header Peter Maydell
2021-02-15 10:58 ` Philippe Mathieu-Daudé
2021-02-15 10:32 ` [PATCH 8/9] hw/display/omap_lcdc: Inline template header into C file Peter Maydell
2021-02-15 10:59 ` Philippe Mathieu-Daudé
2021-02-15 10:32 ` [PATCH 9/9] hw/display/omap_lcdc: Delete unnecessary macro Peter Maydell
2021-02-15 10:59 ` Philippe Mathieu-Daudé
2021-02-16 0:45 ` [PATCH 0/9] arm: drop dead code for non-32-bit-RGB surfaces Richard Henderson
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=20210215103215.4944-7-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=kraxel@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@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).