80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Made all the non-ViRGE S3 cards disable double word access due annoying acceleration issues in some instances of the software cursor for now.

Browse Source
This commit is contained in:
TC1995
2021-06-15 17:25:36 +02:00
parent a41c539f08
commit f423e07f13
1 changed files with 30 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/video/vid_s3.c
View File

@@ -353,38 +353,6 @@ static uint8_t s3_accel_in(uint16_t port, void *p);
static uint8_t s3_pci_read(int func, int addr, void *p); static uint8_t s3_pci_read(int func, int addr, void *p);
static void s3_pci_write(int func, int addr, uint8_t val, void *p); static void s3_pci_write(int func, int addr, uint8_t val, void *p);
/*Remap address for chain-4/doubleword style layout*/
static __inline uint32_t
dword_remap(svga_t *svga, uint32_t in_addr)
{
if (svga->packed_chain4)
return in_addr;
return ((in_addr << 2) & 0x3fff0) |
((in_addr >> 14) & 0xc) |
(in_addr & ~0x3fffc);
}
static __inline uint32_t
dword_remap_w(svga_t *svga, uint32_t in_addr)
{
if (svga->packed_chain4)
return in_addr;
return ((in_addr << 2) & 0x1fff8) |
((in_addr >> 14) & 0x6) |
(in_addr & ~0x1fffe);
}
static __inline uint32_t
dword_remap_l(svga_t *svga, uint32_t in_addr)
{
if (svga->packed_chain4)
return in_addr;
return ((in_addr << 2) & 0xfffc) |
((in_addr >> 14) & 0x3) |
(in_addr & ~0xffff);
}
static __inline void static __inline void
wake_fifo_thread(s3_t *s3) wake_fifo_thread(s3_t *s3)
{ {
@@ -503,15 +471,17 @@ s3_accel_out_pixtrans_w(s3_t *s3, uint16_t val)
s3_accel_start(8, 1, val | (val << 16), 0, s3); s3_accel_start(8, 1, val | (val << 16), 0, s3);
} else if ((s3->accel.cmd & 0x400) && (svga->crtc[0x53] & 0x08)) } else if ((s3->accel.cmd & 0x400) && (svga->crtc[0x53] & 0x08))
s3_accel_start(32, 1, val | (val << 16), 0, s3); s3_accel_start(32, 1, val | (val << 16), 0, s3);
else else {
s3_accel_start(16, 1, val | (val << 16), 0, s3); s3_accel_start(16, 1, val | (val << 16), 0, s3);
}
} else { } else {
if ((s3->accel.cmd & 0x600) == 0x000) if ((s3->accel.cmd & 0x600) == 0x000)
s3_accel_start(1, 1, 0xffffffff, val | (val << 16), s3); s3_accel_start(1, 1, 0xffffffff, val | (val << 16), s3);
else if (s3->accel.cmd & 0x400) else if (s3->accel.cmd & 0x400)
s3_accel_start(4, 1, 0xffffffff, val | (val << 16), s3); s3_accel_start(4, 1, 0xffffffff, val | (val << 16), s3);
else else {
s3_accel_start(2, 1, 0xffffffff, val | (val << 16), s3); s3_accel_start(2, 1, 0xffffffff, val | (val << 16), s3);
}
} }
} }
} }
@@ -533,7 +503,7 @@ s3_accel_out_pixtrans_l(s3_t *s3, uint32_t val)
if (s3->accel.cmd & 0x1000) if (s3->accel.cmd & 0x1000)
val = ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24); val = ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24);
s3_accel_start(32, 1, val, 0, s3); s3_accel_start(32, 1, val, 0, s3);
} else if ((s3->accel.cmd & 0x600) == 0x200) { } else if ((s3->accel.cmd & 0x600) == 0x200) {
if (s3->accel.cmd & 0x1000) if (s3->accel.cmd & 0x1000)
val = ((val & 0xff00ff00) >> 8) | ((val & 0x00ff00ff) << 8); val = ((val & 0xff00ff00) >> 8) | ((val & 0x00ff00ff) << 8);
s3_accel_start(16, 1, val, 0, s3); s3_accel_start(16, 1, val, 0, s3);
@@ -547,7 +517,7 @@ s3_accel_out_pixtrans_l(s3_t *s3, uint32_t val)
} else { } else {
if (s3->accel.cmd & 0x400) { if (s3->accel.cmd & 0x400) {
s3_accel_start(4, 1, 0xffffffff, val, s3); s3_accel_start(4, 1, 0xffffffff, val, s3);
} else if ((s3->accel.cmd & 0x600) == 0x200) { } else if ((s3->accel.cmd & 0x600) == 0x200) {
s3_accel_start(2, 1, 0xffffffff, val, s3); s3_accel_start(2, 1, 0xffffffff, val, s3);
s3_accel_start(2, 1, 0xffffffff, val >> 16, s3); s3_accel_start(2, 1, 0xffffffff, val >> 16, s3);
} else { } else {
@@ -1666,10 +1636,8 @@ s3_hwcursor_draw(svga_t *svga, int displine)
for (x = 0; x < 64; x += 16) for (x = 0; x < 64; x += 16)
{ {
uint32_t remapped_addr = dword_remap(svga, svga->hwcursor_latch.addr); dat[0] = (svga->vram[svga->hwcursor_latch.addr] << 8) | svga->vram[svga->hwcursor_latch.addr + 1];
dat[1] = (svga->vram[svga->hwcursor_latch.addr + 2] << 8) | svga->vram[svga->hwcursor_latch.addr + 3];
dat[0] = (svga->vram[remapped_addr] << 8) | svga->vram[remapped_addr + 1];
dat[1] = (svga->vram[remapped_addr + 2] << 8) | svga->vram[remapped_addr + 3];
if (svga->crtc[0x55] & 0x10) { if (svga->crtc[0x55] & 0x10) {
/*X11*/ /*X11*/
for (xx = 0; xx < 16; xx++) { for (xx = 0; xx < 16; xx++) {
@@ -1947,8 +1915,7 @@ static void s3_trio64v_overlay_draw(svga_t *svga, int displine)
int x_size, x_read = 4, x_write = 4; int x_size, x_read = 4, x_write = 4;
int x; int x;
uint32_t *p; uint32_t *p;
uint32_t remapped_addr = dword_remap(svga, svga->overlay_latch.addr); uint8_t *src = &svga->vram[svga->overlay_latch.addr];
uint8_t *src = &svga->vram[remapped_addr];
p = &(buffer32->line[displine][offset + svga->x_add]); p = &(buffer32->line[displine][offset + svga->x_add]);
@@ -2274,8 +2241,6 @@ s3_out(uint16_t addr, uint8_t val, void *p)
{ {
case 0x31: case 0x31:
s3->ma_ext = (s3->ma_ext & 0x1c) | ((val & 0x30) >> 4); s3->ma_ext = (s3->ma_ext & 0x1c) | ((val & 0x30) >> 4);
if (!svga->packed_chain4)
svga->force_dword_mode = !!(val & 0x08);
break; break;
case 0x32: case 0x32:
if (svga->crtc[0x31] & 0x30) if (svga->crtc[0x31] & 0x30)
@@ -2605,6 +2570,10 @@ static void s3_recalctimings(svga_t *svga)
svga->lowres = !((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)); svga->lowres = !((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10));
if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) { if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) {
if (!(svga->crtc[0x14] & 0x40)) /*There are still accel issues with dword mode enabled, so
disable dword mode for now.*/
svga->crtc[0x14] |= 0x40;
switch (svga->bpp) { switch (svga->bpp) {
case 8: case 8:
svga->render = svga_render_8bpp_highres; svga->render = svga_render_8bpp_highres;
@@ -2709,6 +2678,10 @@ static void s3_trio64v_recalctimings(svga_t *svga)
svga->lowres = !((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)); svga->lowres = !((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10));
if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) { if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) {
if (!(svga->crtc[0x14] & 0x40)) /*There are still accel issues with dword mode enabled, so
disable dword mode for now.*/
svga->crtc[0x14] |= 0x40;
switch (svga->bpp) { switch (svga->bpp) {
case 8: case 8:
svga->render = svga_render_8bpp_highres; svga->render = svga_render_8bpp_highres;
@@ -3758,9 +3731,9 @@ polygon_setup(s3_t *s3)
} }
#define READ(addr, dat) if (s3->bpp == 0) dat = svga->vram[dword_remap(svga, addr) & s3->vram_mask]; \ #define READ(addr, dat) if (s3->bpp == 0) dat = svga->vram[(addr) & s3->vram_mask]; \
else if (s3->bpp == 1) dat = vram_w[dword_remap_w(svga, addr) & (s3->vram_mask >> 1)]; \ else if (s3->bpp == 1) dat = vram_w[(addr) & (s3->vram_mask >> 1)]; \
else dat = vram_l[dword_remap_l(svga, addr) & (s3->vram_mask >> 2)]; else dat = vram_l[(addr) & (s3->vram_mask >> 2)];
#define MIX_READ { \ #define MIX_READ { \
switch ((mix_dat & mix_mask) ? (s3->accel.frgd_mix & 0xf) : (s3->accel.bkgd_mix & 0xf)) \ switch ((mix_dat & mix_mask) ? (s3->accel.frgd_mix & 0xf) : (s3->accel.bkgd_mix & 0xf)) \
@@ -4065,18 +4038,18 @@ polygon_setup(s3_t *s3)
#define WRITE(addr, dat) if (s3->bpp == 0) \ #define WRITE(addr, dat) if (s3->bpp == 0) \
{ \ { \
svga->vram[dword_remap(svga, addr) & s3->vram_mask] = dat; \ svga->vram[(addr) & s3->vram_mask] = dat; \
svga->changedvram[(dword_remap(svga, addr) & s3->vram_mask) >> 12] = changeframecount; \ svga->changedvram[((addr) & s3->vram_mask) >> 12] = changeframecount; \
} \ } \
else if (s3->bpp == 1) \ else if (s3->bpp == 1) \
{ \ { \
vram_w[dword_remap_w(svga, addr) & (s3->vram_mask >> 1)] = dat; \ vram_w[(addr) & (s3->vram_mask >> 1)] = dat; \
svga->changedvram[(dword_remap_w(svga, addr) & (s3->vram_mask >> 1)) >> 11] = changeframecount; \ svga->changedvram[((addr) & (s3->vram_mask >> 1)) >> 11] = changeframecount; \
} \ } \
else \ else \
{ \ { \
vram_l[dword_remap_l(svga, addr) & (s3->vram_mask >> 2)] = dat; \ vram_l[(addr) & (s3->vram_mask >> 2)] = dat; \
svga->changedvram[(dword_remap_l(svga, addr) & (s3->vram_mask >> 2)) >> 10] = changeframecount; \ svga->changedvram[((addr) & (s3->vram_mask >> 2)) >> 10] = changeframecount; \
} }
@@ -6111,8 +6084,7 @@ static void *s3_init(const device_t *info)
svga->crtc[0x59] = 0x00; svga->crtc[0x59] = 0x00;
svga->crtc[0x5a] = 0x0a; svga->crtc[0x5a] = 0x0a;
} }
svga->packed_chain4 = 1;
svga->ramdac = device_add(&ibm_rgb528_ramdac_device); svga->ramdac = device_add(&ibm_rgb528_ramdac_device);
svga->clock_gen = device_add(&icd2061_device); svga->clock_gen = device_add(&icd2061_device);
svga->getclock = icd2061_getclock; svga->getclock = icd2061_getclock;
@@ -6135,7 +6107,6 @@ static void *s3_init(const device_t *info)
svga->crtc[0x59] = 0x00; svga->crtc[0x59] = 0x00;
svga->crtc[0x5a] = 0x0a; svga->crtc[0x5a] = 0x0a;
} }
svga->packed_chain4 = 1;
svga->ramdac = device_add(&sdac_ramdac_device); svga->ramdac = device_add(&sdac_ramdac_device);
svga->clock_gen = svga->ramdac; svga->clock_gen = svga->ramdac;
@@ -6159,7 +6130,7 @@ static void *s3_init(const device_t *info)
case S3_PHOENIX_TRIO64VPLUS_ONBOARD: case S3_PHOENIX_TRIO64VPLUS_ONBOARD:
case S3_DIAMOND_STEALTH64_764: case S3_DIAMOND_STEALTH64_764:
if (device_get_config_int("memory") == 1) if (device_get_config_int("memory") == 1)
s3->svga.vram_max = 1 << 20; /* Phoenix BIOS does not expect VRAM to be mirrored. */ svga->vram_max = 1 << 20; /* Phoenix BIOS does not expect VRAM to be mirrored. */
/* Fall over. */ /* Fall over. */
case S3_NUMBER9_9FX: case S3_NUMBER9_9FX:
@@ -6171,7 +6142,6 @@ static void *s3_init(const device_t *info)
if (info->local == S3_PHOENIX_TRIO64VPLUS || info->local == S3_PHOENIX_TRIO64VPLUS_ONBOARD) { if (info->local == S3_PHOENIX_TRIO64VPLUS || info->local == S3_PHOENIX_TRIO64VPLUS_ONBOARD) {
if (s3->pci) if (s3->pci)
svga->crtc[0x53] = 0x08; svga->crtc[0x53] = 0x08;
svga->packed_chain4 = 1;
} }
svga->clock_gen = s3; svga->clock_gen = s3;
@@ -6185,7 +6155,6 @@ static void *s3_init(const device_t *info)
s3->packed_mmio = 1; s3->packed_mmio = 1;
svga->crtc[0x53] = 0x08; svga->crtc[0x53] = 0x08;
svga->crtc[0x6c] = 1; svga->crtc[0x6c] = 1;
svga->packed_chain4 = 1;
svga->clock_gen = s3; svga->clock_gen = s3;
svga->getclock = s3_trio64_getclock; svga->getclock = s3_trio64_getclock;
@@ -6197,6 +6166,8 @@ static void *s3_init(const device_t *info)
s3->i2c = i2c_gpio_init("ddc_s3"); s3->i2c = i2c_gpio_init("ddc_s3");
s3->ddc = ddc_init(i2c_gpio_get_bus(s3->i2c)); s3->ddc = ddc_init(i2c_gpio_get_bus(s3->i2c));
svga->packed_chain4 = 1;
return s3; return s3;
} }