diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
index 579436891c..53bf438b42 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
@@ -4,13 +4,15 @@
Changes done for each driverversion:
-head (SVN 0.71, Rudolf)
+head (SVN 0.72, Rudolf)
- The overlay engine code now respects the B_OVERLAY_COLOR_KEY flag instead of forcing keying ON;
- Hook GET_ACCELERANT_DEVICE_INFO now returns much more detailed info about the card in use;
- Hooks INIT_ACCELERANT and CLONE_ACCELERANT now enforce their correct use; returning error B_NOT_ALLOWED in case of errors;
- Improved coldstart RAM tests for NV10 and higher: they could fail to correctly program the card on 'high-voltage' AGP 1.0 slots (confirmed a NV11);
-
- Added support for acceleration engine 2D command SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT (as defined by Be) for all cards.
+
- Added support for acceleration engine 2D command SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT (as defined by Be) for all cards;
+
- Fixed driver not always finding it's VGA BIOS when started and stopped more than once per system uptime 'session';
+
- Fixed 'BScreen Sync-to-Retrace not working' bug that appeared on all dualhead cards when CRTC2 was used as primary CRTC. On some systems outthere this bug might have shown itself as a 'system (or app) hanging' error occuring while using apps that feature explicit retrace sync. Completely rewrote interrupt handling to now handle retrace syncs on both CRTC1 and CRTC2, although only the CRTC used as primary will be enabled (for now).
nv_driver 0.67 (Rudolf)
diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
index 98b5212b9b..b022231c7e 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
@@ -391,18 +391,18 @@ static void dumprom (void *rom, uint32 size, pci_info pcii)
}
/* return 1 if vblank interrupt has occured */
-static int caused_vbi(vuint32 * regs)
+static int caused_vbi_crtc1(vuint32 * regs)
{
return (NV_REG32(NV32_CRTC_INTS) & 0x00000001);
}
/* clear the vblank interrupt */
-static void clear_vbi(vuint32 * regs)
+static void clear_vbi_crtc1(vuint32 * regs)
{
NV_REG32(NV32_CRTC_INTS) = 0x00000001;
}
-static void enable_vbi(vuint32 * regs)
+static void enable_vbi_crtc1(vuint32 * regs)
{
/* clear the vblank interrupt */
NV_REG32(NV32_CRTC_INTS) = 0x00000001;
@@ -412,12 +412,56 @@ static void enable_vbi(vuint32 * regs)
NV_REG32(NV32_MAIN_INTE) = 0x00000001;
}
-static void disable_vbi(vuint32 * regs)
+static void disable_vbi_crtc1(vuint32 * regs)
{
/* disable nVidia interrupt source vblank */
NV_REG32(NV32_CRTC_INTE) &= 0xfffffffe;
/* clear the vblank interrupt */
NV_REG32(NV32_CRTC_INTS) = 0x00000001;
+}
+
+/* return 1 if vblank interrupt has occured */
+static int caused_vbi_crtc2(vuint32 * regs)
+{
+ return (NV_REG32(NV32_CRTC2_INTS) & 0x00000001);
+}
+
+/* clear the vblank interrupt */
+static void clear_vbi_crtc2(vuint32 * regs)
+{
+ NV_REG32(NV32_CRTC2_INTS) = 0x00000001;
+}
+
+static void enable_vbi_crtc2(vuint32 * regs)
+{
+ /* clear the vblank interrupt */
+ NV_REG32(NV32_CRTC2_INTS) = 0x00000001;
+ /* enable nVidia interrupt source vblank */
+ NV_REG32(NV32_CRTC2_INTE) |= 0x00000001;
+ /* enable nVidia interrupt system hardware (b0-1) */
+ NV_REG32(NV32_MAIN_INTE) = 0x00000001;
+}
+
+static void disable_vbi_crtc2(vuint32 * regs)
+{
+ /* disable nVidia interrupt source vblank */
+ NV_REG32(NV32_CRTC2_INTE) &= 0xfffffffe;
+ /* clear the vblank interrupt */
+ NV_REG32(NV32_CRTC2_INTS) = 0x00000001;
+}
+
+static void disable_vbi_all(vuint32 * regs)
+{
+ /* disable nVidia interrupt source vblank */
+ NV_REG32(NV32_CRTC_INTE) &= 0xfffffffe;
+ /* clear the vblank interrupt */
+ NV_REG32(NV32_CRTC_INTS) = 0x00000001;
+
+ /* disable nVidia interrupt source vblank */
+ NV_REG32(NV32_CRTC2_INTE) &= 0xfffffffe;
+ /* clear the vblank interrupt */
+ NV_REG32(NV32_CRTC2_INTS) = 0x00000001;
+
/* disable nVidia interrupt system hardware (b0-1) */
NV_REG32(NV32_MAIN_INTE) = 0x00000000;
}
@@ -880,10 +924,13 @@ nv_interrupt(void *data)
regs = di->regs;
/* was it a VBI? */
- if (caused_vbi(regs)) {
- /*clear the interrupt*/
- clear_vbi(regs);
- /*release the semaphore*/
+ //fixme:
+ //rewrite once we use one driver instance 'per head' (instead of 'per card')
+ if (caused_vbi_crtc1(regs) || caused_vbi_crtc2(regs)) {
+ /* clear the interrupt(s) */
+ clear_vbi_crtc1(regs);
+ clear_vbi_crtc2(regs);
+ /* release the semaphore */
handled = thread_interrupt_work(flags, regs, si);
}
@@ -1027,7 +1074,9 @@ static status_t open_hook (const char* name, uint32 flags, void** cookie) {
result = B_OK;
/* disable and clear any pending interrupts */
- disable_vbi(di->regs);
+ //fixme:
+ //distinquish between crtc1/crtc2 once all heads get seperate driver instances!
+ disable_vbi_all(di->regs);
/* preset we can't use INT related functions */
si->ps.int_assigned = false;
@@ -1152,7 +1201,9 @@ free_hook (void* dev) {
goto unlock_and_exit;
/* disable and clear any pending interrupts */
- disable_vbi(regs);
+ //fixme:
+ //distinquish between crtc1/crtc2 once all heads get seperate driver instances!
+ disable_vbi_all(regs);
if (si->ps.int_assigned)
{
@@ -1240,13 +1291,21 @@ control_hook (void* dev, uint32 msg, void *buf, size_t len) {
}
} break;
case NV_RUN_INTERRUPTS: {
- nv_set_bool_state *ri = (nv_set_bool_state *)buf;
- if (ri->magic == NV_PRIVATE_DATA_MAGIC) {
+ nv_set_vblank_int *vi = (nv_set_vblank_int *)buf;
+ if (vi->magic == NV_PRIVATE_DATA_MAGIC) {
vuint32 *regs = di->regs;
- if (ri->do_it) {
- enable_vbi(regs);
+ if (!(vi->crtc)) {
+ if (vi->do_it) {
+ enable_vbi_crtc1(regs);
+ } else {
+ disable_vbi_crtc1(regs);
+ }
} else {
- disable_vbi(regs);
+ if (vi->do_it) {
+ enable_vbi_crtc2(regs);
+ } else {
+ disable_vbi_crtc2(regs);
+ }
}
result = B_OK;
}