mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-25 12:55:32 -07:00
Code Issues Packages Projects Releases Activity

Run PTIMER at a reasonable speed. Fix I2C register.s This means we actually for real get beyond stateGr and now try to accelerate rendering

Browse Source
This commit is contained in:
starfrost013
2024-12-31 22:03:06 +00:00
parent 486087face
commit f7ccbc4e71
7 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/nv/nv3/nv3_core.c
View File

@@ -63,8 +63,8 @@ uint8_t nv3_mmio_read8(uint32_t addr, void* priv)
ret = nv3_svga_in(real_address, nv3);
nv_log("NV3: Redirected MMIO read8 to SVGA: addr=0x%04x returned 0x%02x", addr, ret);
nv_log("NV3: Redirected MMIO read8 to SVGA: addr=0x%04x returned 0x%02x\n", addr, ret);
return ret;
}
@@ -94,7 +94,7 @@ uint16_t nv3_mmio_read16(uint32_t addr, void* priv)
ret = nv3_svga_in(real_address, nv3)
| (nv3_svga_in(real_address + 1, nv3) << 8);
nv_log("NV3: Redirected MMIO read16 to SVGA: addr=0x%04x returned 0x%04x", addr, ret);
nv_log("NV3: Redirected MMIO read16 to SVGA: addr=0x%04x returned 0x%04x\n", addr, ret);
return ret;
}
@@ -126,7 +126,7 @@ uint32_t nv3_mmio_read32(uint32_t addr, void* priv)
| (nv3_svga_in(real_address + 2, nv3) << 16)
| (nv3_svga_in(real_address + 3, nv3) << 24);
nv_log("NV3: Redirected MMIO read32 to SVGA: addr=0x%04x returned 0x%08x", addr, ret);
nv_log("NV3: Redirected MMIO read32 to SVGA: addr=0x%04x returned 0x%08x\n", addr, ret);
return ret;
}
@@ -152,7 +152,7 @@ void nv3_mmio_write8(uint32_t addr, uint8_t val, void* priv)
// svga writes are not logged anyway rn
uint32_t real_address = addr & 0x3FF;
nv_log("NV3: Redirected MMIO write8 to SVGA: addr=0x%04x val=0x%02x", addr, val);
nv_log("NV3: Redirected MMIO write8 to SVGA: addr=0x%04x val=0x%02x\n", addr, val);
nv3_svga_out(real_address, val & 0xFF, nv3);
return;
@@ -183,7 +183,7 @@ void nv3_mmio_write16(uint32_t addr, uint16_t val, void* priv)
// svga writes are not logged anyway rn
uint32_t real_address = addr & 0x3FF;
nv_log("NV3: Redirected MMIO write16 to SVGA: addr=0x%04x val=0x%04x", addr, val);
nv_log("NV3: Redirected MMIO write16 to SVGA: addr=0x%04x val=0x%04x\n", addr, val);
nv3_svga_out(real_address, val & 0xFF, nv3);
nv3_svga_out(real_address + 1, (val >> 8) & 0xFF, nv3);
@@ -215,7 +215,7 @@ void nv3_mmio_write32(uint32_t addr, uint32_t val, void* priv)
// svga writes are not logged anyway rn
uint32_t real_address = addr & 0x3FF;
nv_log("NV3: Redirected MMIO write32 to SVGA: addr=0x%04x val=0x%08x", addr, val);
nv_log("NV3: Redirected MMIO write32 to SVGA: addr=0x%04x val=0x%08x\n", addr, val);
nv3_svga_out(real_address, val & 0xFF, nv3);
nv3_svga_out(real_address + 1, (val >> 8) & 0xFF, nv3);
@@ -704,7 +704,7 @@ void nv3_svga_out(uint16_t addr, uint8_t val, void* priv)
case NV3_CRTC_REGISTER_RMA:
nv3->pbus.rma.mode = val & NV3_CRTC_REGISTER_RMA_MODE_MAX;
break;
case NV3_CRTC_REGISTER_I2C:
case NV3_CRTC_REGISTER_I2C_GPIO:
uint8_t scl = !!(val & 0x20);
uint8_t sda = !!(val & 0x10);
// Set an I2C GPIO register

18
src/video/nv/nv3/subsystems/nv3_pramdac.c
View File

@@ -50,18 +50,16 @@ void nv3_pramdac_init()
// Polls the pixel clock.
// This updates the 2D/3D engine PGRAPH
void nv3_pramdac_pixel_clock_poll()
void nv3_pramdac_pixel_clock_poll(double real_time)
{
// TODO: UPDATE PGRAPH!
// TODO: ????
}
// Polls the memory clock.
void nv3_pramdac_memory_clock_poll()
void nv3_pramdac_memory_clock_poll(double real_time)
{
//nv3_t* nv3_poll = (nv3_t*)priv;
// Let's hope qeeg was right here.
nv3_ptimer_tick();
nv3_ptimer_tick(real_time);
// TODO: UPDATE PGRAPH!
}
// Gets the vram clock register.
@@ -120,10 +118,8 @@ void nv3_pramdac_set_vram_clock()
nv_log("NV3: Memory clock = %.2f MHz\n", frequency / 1000000.0f);
nv3->nvbase.memory_clock_period = time;
nv3->nvbase.memory_clock_frequency = frequency;
//timer_on_auto(&nv3->nvbase.memory_clock_timer, nv3->nvbase.memory_clock_period);
// Create and start if it it's not running.
if (!nv3->nvbase.memory_clock_timer)
{
@@ -170,7 +166,7 @@ void nv3_pramdac_set_pixel_clock()
nv_log("NV3: Pixel clock = %.2f MHz\n", frequency / 1000000.0f);
nv3->nvbase.pixel_clock_period = time;
nv3->nvbase.pixel_clock_frequency = frequency;
// Create and start if it it's not running.
if (!nv3->nvbase.pixel_clock_timer)

11
src/video/nv/nv3/subsystems/nv3_ptimer.c
View File

@@ -57,7 +57,7 @@ void nv3_ptimer_interrupt(uint32_t num)
}
// Ticks the timer.
void nv3_ptimer_tick()
void nv3_ptimer_tick(double real_time)
{
// do not divide by zero
if (nv3->ptimer.clock_numerator == 0
@@ -67,7 +67,14 @@ void nv3_ptimer_tick()
// get the current time
// Due to timer system limitations, the timer system is not capable of running at 100 megahertz. Therefore, we have to scale it down and then scale up the level of changes
// to the state.
double current_time = ((double)nv3->ptimer.clock_numerator * NV3_86BOX_TIMER_SYSTEM_FIX_QUOTIENT) / (double)nv3->ptimer.clock_denominator; // *10.0?
// See Envytools. We need to use the frequency as a source.
// But we need to figure out how many cycles actually occurred because this counts up every cycle...
// Convert to microseconds
double freq_base = (real_time / 1000000.0f) / ((double)1.0 / nv3->nvbase.memory_clock_frequency);
double current_time = freq_base * ((double)nv3->ptimer.clock_numerator * NV3_86BOX_TIMER_SYSTEM_FIX_QUOTIENT) / (double)nv3->ptimer.clock_denominator; // *10.0?
// Logging is suppressed when reading this register because it is read many times
// So we only log when we update.

6
src/video/nv/nv_rivatimer.c
View File

@@ -59,7 +59,7 @@ void rivatimer_init()
}
// Creates a rivatimer.
rivatimer_t* rivatimer_create(double period, void (*callback)())
rivatimer_t* rivatimer_create(double period, void (*callback)(double real_time))
{
rivatimer_t* new_rivatimer = NULL;
@@ -210,7 +210,7 @@ void rivatimer_update_all()
continue;
}
rivatimer_ptr->callback();
rivatimer_ptr->callback(microseconds);
}
rivatimer_ptr = rivatimer_ptr->next;
@@ -254,7 +254,7 @@ double rivatimer_get_time(rivatimer_t* rivatimer_ptr)
return rivatimer_ptr->time;
}
void rivatimer_set_callback(rivatimer_t* rivatimer_ptr, void (*callback)())
void rivatimer_set_callback(rivatimer_t* rivatimer_ptr, void (*callback)(double real_time))
{
if (!rivatimer_really_exists(rivatimer_ptr))
fatal("rivatimer_set_callback: The timer has been destroyed, or never existed in the first place. Punch starfrost in the face");