From 41997e1badfbf2ec5c7c5b492852b8e4fa907d3c Mon Sep 17 00:00:00 2001
From: AITUS95 <48457684+AITUS95@users.noreply.github.com>
Date: Tue, 30 Dec 2025 02:08:20 +0100
Subject: [PATCH 1/3] Remove redundant FIFO wait calls in vid_s3_virge.c

---
 src/video/vid_s3_virge.c | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c
index bb1b2b11e..844a8d51e 100644
--- a/src/video/vid_s3_virge.c
+++ b/src/video/vid_s3_virge.c
@@ -1378,122 +1378,96 @@ s3_virge_mmio_read_l(uint32_t addr, void *priv)
         case 0xa4d4:
         case 0xa8d4:
         case 0xacd4:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_base;
             break;
         case 0xa4d8:
         case 0xa8d8:
         case 0xacd8:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.dest_base;
             break;
         case 0xa4dc:
         case 0xa8dc:
         case 0xacdc:
-            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.clip_l << 16) | virge->s3d.clip_r;
             break;
         case 0xa4e0:
         case 0xa8e0:
         case 0xace0:
-            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.clip_t << 16) | virge->s3d.clip_b;
             break;
         case 0xa4e4:
         case 0xa8e4:
         case 0xace4:
-            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.dest_str << 16) | virge->s3d.src_str;
             break;
         case 0xa4e8:
         case 0xace8:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.mono_pat_0;
             break;
         case 0xa4ec:
         case 0xacec:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.mono_pat_1;
             break;
         case 0xa4f0:
         case 0xacf0:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pat_bg_clr;
             break;
         case 0xa4f4:
         case 0xa8f4:
         case 0xacf4:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pat_fg_clr;
             break;
         case 0xa4f8:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_bg_clr;
             break;
         case 0xa4fc:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_fg_clr;
             break;
         case 0xa500:
         case 0xa900:
         case 0xad00:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.cmd_set;
             break;
         case 0xa504:
-            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.r_width << 16) | virge->s3d.r_height;
             break;
         case 0xa508:
-            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.rsrc_x << 16) | virge->s3d.rsrc_y;
             break;
         case 0xa50c:
-            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.rdest_x << 16) | virge->s3d.rdest_y;
             break;
         case 0xa96c:
-            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.lxend0 << 16) | virge->s3d.lxend1;
             break;
         case 0xa970:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.ldx;
             break;
         case 0xa974:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.lxstart;
             break;
         case 0xa978:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.lystart;
             break;
         case 0xa97c:
-            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.line_dir << 31) | virge->s3d.lycnt;
             break;
         case 0xad68:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.prdx;
             break;
         case 0xad6c:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.prxstart;
             break;
         case 0xad70:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pldx;
             break;
         case 0xad74:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.plxstart;
             break;
         case 0xad78:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pystart;
             break;
         case 0xad7c:
-            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pycnt;
             break;
 

From 33bd395dc55aba011d6714af15ccd23cf7659b6d Mon Sep 17 00:00:00 2001
From: AITUS95 <48457684+AITUS95@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:38:12 +0100
Subject: [PATCH 2/3] Add s3_virge_wait_fifo_idle calls for register access

---
 src/video/vid_s3_virge.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c
index 844a8d51e..bb1b2b11e 100644
--- a/src/video/vid_s3_virge.c
+++ b/src/video/vid_s3_virge.c
@@ -1378,96 +1378,122 @@ s3_virge_mmio_read_l(uint32_t addr, void *priv)
         case 0xa4d4:
         case 0xa8d4:
         case 0xacd4:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_base;
             break;
         case 0xa4d8:
         case 0xa8d8:
         case 0xacd8:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.dest_base;
             break;
         case 0xa4dc:
         case 0xa8dc:
         case 0xacdc:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.clip_l << 16) | virge->s3d.clip_r;
             break;
         case 0xa4e0:
         case 0xa8e0:
         case 0xace0:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.clip_t << 16) | virge->s3d.clip_b;
             break;
         case 0xa4e4:
         case 0xa8e4:
         case 0xace4:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.dest_str << 16) | virge->s3d.src_str;
             break;
         case 0xa4e8:
         case 0xace8:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.mono_pat_0;
             break;
         case 0xa4ec:
         case 0xacec:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.mono_pat_1;
             break;
         case 0xa4f0:
         case 0xacf0:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pat_bg_clr;
             break;
         case 0xa4f4:
         case 0xa8f4:
         case 0xacf4:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pat_fg_clr;
             break;
         case 0xa4f8:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_bg_clr;
             break;
         case 0xa4fc:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_fg_clr;
             break;
         case 0xa500:
         case 0xa900:
         case 0xad00:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.cmd_set;
             break;
         case 0xa504:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.r_width << 16) | virge->s3d.r_height;
             break;
         case 0xa508:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.rsrc_x << 16) | virge->s3d.rsrc_y;
             break;
         case 0xa50c:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.rdest_x << 16) | virge->s3d.rdest_y;
             break;
         case 0xa96c:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.lxend0 << 16) | virge->s3d.lxend1;
             break;
         case 0xa970:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.ldx;
             break;
         case 0xa974:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.lxstart;
             break;
         case 0xa978:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.lystart;
             break;
         case 0xa97c:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.line_dir << 31) | virge->s3d.lycnt;
             break;
         case 0xad68:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.prdx;
             break;
         case 0xad6c:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.prxstart;
             break;
         case 0xad70:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pldx;
             break;
         case 0xad74:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.plxstart;
             break;
         case 0xad78:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pystart;
             break;
         case 0xad7c:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pycnt;
             break;
 

From 61918e4d72479e07349022401b072a621ad12028 Mon Sep 17 00:00:00 2001
From: AITUS95 <48457684+AITUS95@users.noreply.github.com>
Date: Tue, 30 Dec 2025 21:14:13 +0100
Subject: [PATCH 3/3] Implement wait states for MMIO reads

Added wait states for MMIO reads to reduce excessive polling.
---
 src/video/vid_s3_virge.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c
index bb1b2b11e..abeba064e 100644
--- a/src/video/vid_s3_virge.c
+++ b/src/video/vid_s3_virge.c
@@ -24,6 +24,7 @@
 #include <stdatomic.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/io.h>
 #include <86box/timer.h>
 #include <86box/dma.h>
@@ -1191,6 +1192,9 @@ s3_virge_mmio_read(uint32_t addr, void *priv)
     virge_t *virge = (virge_t *) priv;
     uint8_t  ret;
 
+    /* Add wait states for MMIO reads to prevent excessive polling */
+    cycles -= virge->svga.monitor->mon_video_timing_read_b;
+
     switch (addr & 0xffff) {
         case 0x8504:
             if (!virge->virge_busy)
@@ -1242,6 +1246,9 @@ s3_virge_mmio_read_w(uint32_t addr, void *priv)
     virge_t *virge = (virge_t *) priv;
     uint16_t ret;
 
+    /* Add wait states for MMIO reads to prevent excessive polling */
+    cycles -= virge->svga.monitor->mon_video_timing_read_w;
+
     switch (addr & 0xfffe) {
         case 0x8504:
             ret = 0xc000;
@@ -1275,6 +1282,9 @@ s3_virge_mmio_read_l(uint32_t addr, void *priv)
     virge_t *virge = (virge_t *) priv;
     uint32_t ret   = 0xffffffff;
 
+    /* Add wait states for MMIO reads to prevent excessive polling */
+    cycles -= virge->svga.monitor->mon_video_timing_read_l;
+
     switch (addr & 0xfffc) {
         case 0x8180:
             ret = virge->streams.pri_ctrl;