From nobody Sun Feb 8 22:57:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1565559383; cv=none; d=zoho.com; s=zohoarc; b=M1weqrkZD/asGBWSkIGfmHzvQCliGFGljEGdh+zGvfSCRBo8qbRoC/WQPyQZOBR96Y4DlW57JnAX+AzUV2dpnNvCgner0P8iF6hDMMkDSdnrm8HdNEwLsQeMwqmvkgkQaPK0hfGP5G76F+nlQq70npgntXM02ACRuYvOovNZedg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565559383; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=sLFFNi+Wif6FSdQDZLb+swOVXp+w3oDr3ZIGs9i5tR8=; b=jmtm0ug3o6iPDkoPNXIQEmUYXpgtABUuG8Hw8MoN8Isnb4vOv4n0q5GEYfqGISGO7sIQl+0sN8TaU2JAYEtBHI+89BpiAVDauHck3iT4kHK2Gc5FZQf0TOIYNZPlOfQrgx0KJIZysh9kcH+j6BHkCCtWi4E5Ob5V5cx4kp9wTN0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565559383379490.5968025419429; Sun, 11 Aug 2019 14:36:23 -0700 (PDT) Received: from localhost ([::1]:41886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwvVm-0007hm-Hr for importer@patchew.org; Sun, 11 Aug 2019 17:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58180) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwvSy-00020B-R7 for qemu-devel@nongnu.org; Sun, 11 Aug 2019 17:33:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hwvSw-00045q-Ux for qemu-devel@nongnu.org; Sun, 11 Aug 2019 17:33:28 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:55464) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hwvSw-0003yS-NW for qemu-devel@nongnu.org; Sun, 11 Aug 2019 17:33:26 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 89BB974CC7E; Sun, 11 Aug 2019 23:33:12 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id E718B74B841; Sun, 11 Aug 2019 23:33:11 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Date: Sun, 11 Aug 2019 23:14:53 +0200 MIME-Version: 1.0 To: qemu-devel@nongnu.org Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 152.66.115.2 Subject: [Qemu-devel] [PATCH 5/7] ati-vga: Fix hardware cursor image offset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The crtc_offset is not needed, cur_offset is relative to the start of vram not the start of displayed area. This fixes broken pointer image with MacOS that uses non-0 crtc_offset. Signed-off-by: BALATON Zoltan --- hw/display/ati.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index b849f5d510..bbcdd6bc83 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -132,9 +132,8 @@ static void ati_cursor_define(ATIVGAState *s) return; /* Do not update cursor if locked or rendered by guest */ } /* FIXME handle cur_hv_offs correctly */ - src =3D s->vga.vram_ptr + (s->regs.crtc_offset & 0x07ffffff) + - s->regs.cur_offset - (s->regs.cur_hv_offs >> 16) - - (s->regs.cur_hv_offs & 0xffff) * 16; + src =3D s->vga.vram_ptr + s->regs.cur_offset - + (s->regs.cur_hv_offs >> 16) - (s->regs.cur_hv_offs & 0xffff) * 1= 6; for (i =3D 0; i < 64; i++) { for (j =3D 0; j < 8; j++, idx++) { data[idx] =3D src[i * 16 + j]; @@ -190,8 +189,7 @@ static void ati_cursor_draw_line(VGACommonState *vga, u= int8_t *d, int scr_y) return; } /* FIXME handle cur_hv_offs correctly */ - src =3D s->vga.vram_ptr + (s->regs.crtc_offset & 0x07ffffff) + - s->cursor_offset + (scr_y - vga->hw_cursor_y) * 16; + src =3D s->vga.vram_ptr + s->cursor_offset + (scr_y - vga->hw_cursor_y= ) * 16; dp =3D &dp[vga->hw_cursor_x]; h =3D ((s->regs.crtc_h_total_disp >> 16) + 1) * 8; for (i =3D 0; i < 8; i++) { --=20 2.13.7