[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/6] hw/display/artist: Fix bug in coordinate extraction in artist
From: |
Gerd Hoffmann |
Subject: |
[PULL 6/6] hw/display/artist: Fix bug in coordinate extraction in artist_vram_read() and artist_vram_write() |
Date: |
Wed, 1 Sep 2021 06:19:03 +0200 |
From: Helge Deller <deller@gmx.de>
The CDE desktop on HP-UX 10 shows wrongly rendered pixels when the local screen
menu is closed. This bug was introduced by commit c7050f3f167b
("hw/display/artist: Refactor x/y coordination extraction") which converted the
coordinate extraction in artist_vram_read() and artist_vram_write() to use the
ADDR_TO_X and ADDR_TO_Y macros, but forgot to right-shift the address by 2 as
it was done before.
Signed-off-by: Helge Deller <deller@gmx.de>
Fixes: c7050f3f167b ("hw/display/artist: Refactor x/y coordination extraction")
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Sven Schnelle <svens@stackframe.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <YK1aPb8keur9W7h2@ls3530>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/artist.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/display/artist.c b/hw/display/artist.c
index aa7bd594aac0..21b7fd1b440e 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -1170,8 +1170,8 @@ static void artist_vram_write(void *opaque, hwaddr addr,
uint64_t val,
}
buf = vram_write_buffer(s);
- posy = ADDR_TO_Y(addr);
- posx = ADDR_TO_X(addr);
+ posy = ADDR_TO_Y(addr >> 2);
+ posx = ADDR_TO_X(addr >> 2);
if (!buf->size) {
return;
@@ -1232,8 +1232,8 @@ static uint64_t artist_vram_read(void *opaque, hwaddr
addr, unsigned size)
return 0;
}
- posy = ADDR_TO_Y(addr);
- posx = ADDR_TO_X(addr);
+ posy = ADDR_TO_Y(addr >> 2);
+ posx = ADDR_TO_X(addr >> 2);
if (posy > buf->height || posx > buf->width) {
return 0;
--
2.31.1
- [PULL 0/6] Vga 20210901 patches, Gerd Hoffmann, 2021/09/01
- [PULL 1/6] virtio-gpu: no point of checking res->iov, Gerd Hoffmann, 2021/09/01
- [PULL 2/6] hw/display: Restrict virtio-gpu-udmabuf stubs to !Linux, Gerd Hoffmann, 2021/09/01
- [PULL 3/6] ui/console: Restrict udmabuf_fd() to Linux, Gerd Hoffmann, 2021/09/01
- [PULL 5/6] hw/display/xlnx_dp: fix an out-of-bounds read in xlnx_dp_read, Gerd Hoffmann, 2021/09/01
- [PULL 4/6] vga: don't abort when adding a duplicate isa-vga device, Gerd Hoffmann, 2021/09/01
- [PULL 6/6] hw/display/artist: Fix bug in coordinate extraction in artist_vram_read() and artist_vram_write(),
Gerd Hoffmann <=
- Re: [PULL 0/6] Vga 20210901 patches, Peter Maydell, 2021/09/01