From a5bbd87a2db09fc63ada796b37729385ee35bf13 Mon Sep 17 00:00:00 2001 From: SarahW Date: Wed, 21 Mar 2018 21:52:07 +0000 Subject: [PATCH] ViRGE 256kb wrapping is disabled when enhanced mappings are in use. Fixes ViRGE on XFree86. --- src/vid_s3_virge.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/vid_s3_virge.c b/src/vid_s3_virge.c index 5a04671..0980594 100644 --- a/src/vid_s3_virge.c +++ b/src/vid_s3_virge.c @@ -367,8 +367,6 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p) virge->ma_ext = (virge->ma_ext & 0x1c) | ((val & 0x30) >> 4); break; case 0x32: - if ((svga->crtc[0x67] & 0xc) != 0xc) - svga->vram_display_mask = (val & 0x40) ? 0x3ffff : ((virge->memory_size << 20) - 1); s3_virge_update_irqs(virge); break; @@ -569,7 +567,7 @@ static void s3_virge_recalctimings(svga_t *svga) { svga->rowoffset = (svga->rowoffset * 3) / 4; /*Hack*/ } - svga->vram_display_mask = (svga->crtc[0x32] & 0x40) ? 0x3ffff : ((virge->memory_size << 20) - 1); + svga->vram_display_mask = (!(svga->crtc[0x31] & 0x08) && (svga->crtc[0x32] & 0x40)) ? 0x3ffff : ((virge->memory_size << 20) - 1); //pclog("VGA mode x_disp=%i dispend=%i vtotal=%i\n", svga->hdisp, svga->dispend, svga->vtotal); } else /*Streams mode*/