Skip to contentSkip to conversation

ati-vga: Fix pitch and offset registers mask

PATCH New BALATON Zoltan 1 participant 1 message Apr 4

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ati-vga: Fix pitch and offset registers mask

Remove the Radeon specific masks for offset and pitch registers. While the documentation is not clear about it I believe it is a copy&paste error from the combined DST_PITCH_OFFSET register that has less bits so more constrained than the individual registers which should not have this mask.

---
 hw/display/ati.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
hw/display/ati.c +2 -14
index 07c0961b61..5ca1912340 100644
@@ -835,18 +835,12 @@ static void ati_mm_write(void *opaque, hwaddr addr,
         ati_cursor_define(s);
         break;
     case DST_OFFSET:
-        if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) {
             s->regs.dst_offset = data & 0xfffffff0;
-        } else {
-            s->regs.dst_offset = data & 0xfffffc00;
-        }
         break;
     case DST_PITCH:
-        if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) {
             s->regs.dst_pitch = data & 0x3fff;
+        if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) {
             s->regs.dst_tile = (data >> 16) & 1;
-        } else {
-            s->regs.dst_pitch = data & 0x3ff0;
         }
         break;
     case DST_TILE:
@@ -956,18 +950,12 @@ static void ati_mm_write(void *opaque, hwaddr addr,
         s->regs.dst_height = (data >> 16) & 0x3fff;
         break;
     case SRC_OFFSET:
-        if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) {
             s->regs.src_offset = data & 0xfffffff0;
-        } else {
-            s->regs.src_offset = data & 0xfffffc00;
-        }
         break;
     case SRC_PITCH:
-        if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) {
             s->regs.src_pitch = data & 0x3fff;
+        if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) {
             s->regs.src_tile = (data >> 16) & 1;
-        } else {
-            s->regs.src_pitch = data & 0x3ff0;
         }
         break;
     case DP_BRUSH_BKGD_CLR:
Signature · 1 line
2.41.3