[PATCH] hw/display/artist: Fix bug in coordinate extraction in artist_vram_read()

From: Helge Deller <deller@gmx.de>
To: qemu-devel@nongnu.org
Cc: "Sven Schnelle" <svens@stackframe.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-stable@nongnu.org
Subject: [PATCH] hw/display/artist: Fix bug in coordinate extraction in artist_vram_read()
Date: Mon, 24 May 2021 22:23:20 +0200	[thread overview]
Message-ID: <YKwLOP/IAGG1u7em@ls3530> (raw)

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() 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>
Cc: qemu-stable@nongnu.org

diff --git a/hw/display/artist.c b/hw/display/artist.c
index ed0e637f25..34efd3a565 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -1233,8 +1233,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;

