i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated new INT handling code to not try to determine INT coming from secondary head on singlehead cards. This could potentially lead to int sharing trouble.. Note, still a bit hackish. Better fix would probably be moving a large part from detailed card type recognition code from accelerant to kerneldriver. As I think it's safe enough this way, I'll leave it as it is for now. (trouble that could arise is a nvidia gfx card not working now, though chances are very slim that would happen. Best moment for fix is probably rewriting the driver for seperate instances on a 'per head' basis, when haiku supports multiple heads )

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16284 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2006-02-07 16:20:06 +00:00
parent c72f6a6d0b
commit bdb0f06705
1 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/graphics/nvidia/driver.c
+34 -11
View File
@@ -450,6 +450,12 @@ static void disable_vbi_crtc2(vuint32 * regs)
NV_REG32(NV32_CRTC2_INTS) = 0x00000001; NV_REG32(NV32_CRTC2_INTS) = 0x00000001;
} }
//fixme:
//dangerous code, on singlehead cards better not try accessing secondary head
//registers (card might react in unpredictable ways, though there's only a small
//chance we actually run into this).
//fix requires (some) card recognition code to be moved from accelerant to
//kerneldriver...
static void disable_vbi_all(vuint32 * regs) static void disable_vbi_all(vuint32 * regs)
{ {
/* disable nVidia interrupt source vblank */ /* disable nVidia interrupt source vblank */
@@ -917,21 +923,35 @@ nv_interrupt(void *data)
vuint32 *regs; vuint32 *regs;
/* is someone already handling an interrupt for this device? */ /* is someone already handling an interrupt for this device? */
if (atomic_or(flags, SKD_HANDLER_INSTALLED) & SKD_HANDLER_INSTALLED) { if (atomic_or(flags, SKD_HANDLER_INSTALLED) & SKD_HANDLER_INSTALLED) goto exit0;
goto exit0;
}
/* get regs */ /* get regs */
regs = di->regs; regs = di->regs;
/* was it a VBI? */ /* was it a VBI? */
//fixme: /* note: si->ps.secondary_head was cleared by kerneldriver earlier! (at least) */
//rewrite once we use one driver instance 'per head' (instead of 'per card') if (si->ps.secondary_head)
if (caused_vbi_crtc1(regs) || caused_vbi_crtc2(regs)) { {
/* clear the interrupt(s) */ //fixme:
clear_vbi_crtc1(regs); //rewrite once we use one driver instance 'per head' (instead of 'per card')
clear_vbi_crtc2(regs); if (caused_vbi_crtc1(regs) || caused_vbi_crtc2(regs))
/* release the semaphore */ {
handled = thread_interrupt_work(flags, regs, si); /* clear the interrupt(s) */
clear_vbi_crtc1(regs);
clear_vbi_crtc2(regs);
/* release the semaphore */
handled = thread_interrupt_work(flags, regs, si);
}
}
else
{
if (caused_vbi_crtc1(regs))
{
/* clear the interrupt */
clear_vbi_crtc1(regs);
/* release the semaphore */
handled = thread_interrupt_work(flags, regs, si);
}
} }
/* note that we're not in the handler any more */ /* note that we're not in the handler any more */
@@ -1041,6 +1061,9 @@ static status_t open_hook (const char* name, uint32 flags, void** cookie) {
/* ensure that the accelerant's INIT_ACCELERANT function can be executed */ /* ensure that the accelerant's INIT_ACCELERANT function can be executed */
si->accelerant_in_use = false; si->accelerant_in_use = false;
/* preset singlehead card to prevent early INT routine calls (once installed) to
* wrongly identify the INT request coming from us! */
si->ps.secondary_head = false;
/* note the amount of system RAM the system BIOS assigned to the card if applicable: /* note the amount of system RAM the system BIOS assigned to the card if applicable:
* unified memory architecture (UMA) */ * unified memory architecture (UMA) */