claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

S3 DPMS shouldn't engage if both hsync and vsync are high

Browse Source
This commit is contained in:
RichardG867
2021-04-14 16:08:45 -03:00
parent 202c4425a4
commit d344fce4d4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/vid_s3.c
View File

@@ -2178,7 +2178,7 @@ s3_out(uint16_t addr, uint8_t val, void *p)
return; return;
} else if ((svga->seqaddr == 0x0d) && (svga->seqregs[0x08] == 0x06)) { } else if ((svga->seqaddr == 0x0d) && (svga->seqregs[0x08] == 0x06)) {
svga->seqregs[svga->seqaddr] = val; svga->seqregs[svga->seqaddr] = val;
svga->dpms = ((s3->chip >= S3_VISION964) && (svga->seqregs[0x0d] & 0xf0)) || (svga->crtc[0x56] & ((s3->chip >= S3_TRIO32) ? 0x06 : 0x20)); svga->dpms = ((s3->chip >= S3_VISION964) && (svga->seqregs[0x0d] & 0x50)) || (svga->crtc[0x56] & ((s3->chip >= S3_TRIO32) ? 0x06 : 0x20));
svga_recalctimings(svga); svga_recalctimings(svga);
return; return;
} }
@@ -2387,7 +2387,7 @@ s3_out(uint16_t addr, uint8_t val, void *p)
break; break;
case 0x56: case 0x56:
svga->dpms = ((s3->chip >= S3_VISION964) && (svga->seqregs[0x0d] & 0xf0)) || (svga->crtc[0x56] & ((s3->chip >= S3_TRIO32) ? 0x06 : 0x20)); svga->dpms = ((s3->chip >= S3_VISION964) && (svga->seqregs[0x0d] & 0x50)) || (svga->crtc[0x56] & ((s3->chip >= S3_TRIO32) ? 0x06 : 0x20));
old = ~val; /* force recalc */ old = ~val; /* force recalc */
break; break;

4
src/video/vid_s3_virge.c
View File

@@ -433,7 +433,7 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
return; return;
} else if ((svga->seqaddr == 0x0d) && (svga->seqregs[0x08] == 0x06)) { } else if ((svga->seqaddr == 0x0d) && (svga->seqregs[0x08] == 0x06)) {
svga->seqregs[svga->seqaddr] = val; svga->seqregs[svga->seqaddr] = val;
svga->dpms = (svga->seqregs[0x0d] & 0xf0) || (svga->crtc[0x56] & 0x06); svga->dpms = (svga->seqregs[0x0d] & 0x50) || (svga->crtc[0x56] & 0x06);
svga_recalctimings(svga); svga_recalctimings(svga);
return; return;
} }
@@ -553,7 +553,7 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
break; break;
case 0x56: case 0x56:
svga->dpms = (svga->seqregs[0x0d] & 0xf0) || (svga->crtc[0x56] & 0x06); svga->dpms = (svga->seqregs[0x0d] & 0x50) || (svga->crtc[0x56] & 0x06);
old = ~val; /* force recalc */ old = ~val; /* force recalc */
break; break;