From nobody Mon Feb 9 15:45:20 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562334557; cv=none; d=zoho.com; s=zohoarc; b=KhryZHhKJX9xRi0fD/V1chptAXwl9bv2sVjiHW18TlIAyDInfOiZTMPnrdV+XfVAz6md8dFORKnD8tdIc7lQN3dHSR/a/lIo/tsx3jZ8TRmvnBUw4MmXWtwNe90ptNbAXpnXfi7+bldk7MbZCFgEm9y/2OaHSe7O6pKpqwTj3UE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562334557; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Ouq4Jrob2B/3mmhStjvOa0j/P+sg7LqKTWtC2jEW4ys=; b=mR5f+wn9DR9k8QX0X/UXIujY+hgiL14FdPIEiKxkorT6vCz5Ys2b3Ezm54TAxe+MQzbAVRC582jXuIXgcmCK9ekt65myTgmdTE/lUZkukaYi4VVU5zfpYcmDfELxxhzuU34GaPuoYvQHfdcgUSDpOqkdqSvg8E3DTPFe/CGuPS8= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562334557266899.1111546568051; Fri, 5 Jul 2019 06:49:17 -0700 (PDT) Received: from localhost ([::1]:53328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjOaO-0001Lt-Tz for importer@patchew.org; Fri, 05 Jul 2019 09:49:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40876) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjOUB-0007b0-RB for qemu-devel@nongnu.org; Fri, 05 Jul 2019 09:42:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjOUA-0007bN-Ki for qemu-devel@nongnu.org; Fri, 05 Jul 2019 09:42:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44744) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hjOUA-0007Rs-F0 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 09:42:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 279318830B; Fri, 5 Jul 2019 13:42:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-90.ams2.redhat.com [10.36.116.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE497860E3; Fri, 5 Jul 2019 13:42:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B561117534; Fri, 5 Jul 2019 15:42:39 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 15:42:39 +0200 Message-Id: <20190705134239.11718-5-kraxel@redhat.com> In-Reply-To: <20190705134239.11718-1-kraxel@redhat.com> References: <20190705134239.11718-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 05 Jul 2019 13:42:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/4] ati-vga: Fix setting offset together with pitch for r128pro 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Turns out my last fix to this broke one case for Rage 128 Pro so revert that part of previous patch. This now fixes the remaining rendering problems for MorphOS which now can produce picture with -device ati-vga (although it may not be optimised yet and video overlay emulation is still known to be missing). Fixes: 866ad5f5ff620078f88183aa254f7b02727e6aa3 Signed-off-by: BALATON Zoltan Message-id: da33261a841755691f698db8190c868df0c0d3ae.1562276605.git.balaton= @eik.bme.hu Signed-off-by: Gerd Hoffmann --- hw/display/ati.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 590362ea568c..a747c4cc98c7 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -689,7 +689,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, break; case SRC_PITCH_OFFSET: if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { - s->regs.src_offset =3D (data & 0x1fffff) << 4; + s->regs.src_offset =3D (data & 0x1fffff) << 5; s->regs.src_pitch =3D (data & 0x7fe00000) >> 21; s->regs.src_tile =3D data >> 31; } else { @@ -700,7 +700,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, break; case DST_PITCH_OFFSET: if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { - s->regs.dst_offset =3D (data & 0x1fffff) << 4; + s->regs.dst_offset =3D (data & 0x1fffff) << 5; s->regs.dst_pitch =3D (data & 0x7fe00000) >> 21; s->regs.dst_tile =3D data >> 31; } else { --=20 2.18.1