Commit 146dd326 authored by BALATON Zoltan's avatar BALATON Zoltan Committed by Gerd Hoffmann
Browse files

ati-vga: Fix setting offset together with pitch for r128pro 



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: 866ad5f5
Signed-off-by: default avatarBALATON Zoltan <balaton@eik.bme.hu>
Message-id: da33261a841755691f698db8190c868df0c0d3ae.1562276605.git.balaton@eik.bme.hu
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 584acf34

hw/display/ati.c

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, 
        break;

    case SRC_PITCH_OFFSET:

        if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) {

            s->regs.src_offset = (data & 0x1fffff) << 4;

            s->regs.src_offset = (data & 0x1fffff) << 5;

            s->regs.src_pitch = (data & 0x7fe00000) >> 21;

            s->regs.src_tile = 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 == PCI_DEVICE_ID_ATI_RAGE128_PF) {

            s->regs.dst_offset = (data & 0x1fffff) << 4;

            s->regs.dst_offset = (data & 0x1fffff) << 5;

            s->regs.dst_pitch = (data & 0x7fe00000) >> 21;

            s->regs.dst_tile = data >> 31;

        } else {