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

completed DMA acceleration init code sync to XF86. All cards should be operational again (still untested). Bumped version to 0.65.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15003 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2005-11-17 18:37:52 +00:00
parent 7514b6b4dc
commit 40df1a3a01
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c
+19 -8
View File
@@ -1,7 +1,7 @@
/* NV Acceleration functions */ /* NV Acceleration functions */
/* Author: /* Author:
Rudolf Cornelissen 8/2003-6/2005. Rudolf Cornelissen 8/2003-11/2005.
This code was possible thanks to: This code was possible thanks to:
- the Linux XFree86 NV driver, - the Linux XFree86 NV driver,
@@ -859,7 +859,6 @@ status_t nv_acc_init_dma()
} }
} }
} }
//fixme: still check rest down:
if (si->ps.card_arch >= NV40A) if (si->ps.card_arch >= NV40A)
{ {
@@ -868,8 +867,8 @@ status_t nv_acc_init_dma()
/* copy some RAM configuration info(?) */ /* copy some RAM configuration info(?) */
ACCW(NV20_WHAT_T0, NV_REG32(NV32_PFB_CONFIG_0)); ACCW(NV20_WHAT_T0, NV_REG32(NV32_PFB_CONFIG_0));
ACCW(NV20_WHAT_T1, NV_REG32(NV32_PFB_CONFIG_1)); ACCW(NV20_WHAT_T1, NV_REG32(NV32_PFB_CONFIG_1));
ACCW(NV40_WHAT_T2, NV_REG32(NV32_PFB_CONFIG_0));//updated? ACCW(NV40_WHAT_T2, NV_REG32(NV32_PFB_CONFIG_0));
ACCW(NV40_WHAT_T3, NV_REG32(NV32_PFB_CONFIG_1));//updated? ACCW(NV40_WHAT_T3, NV_REG32(NV32_PFB_CONFIG_1));
/* setup location of active screen in framebuffer */ /* setup location of active screen in framebuffer */
ACCW(NV20_OFFSET0, ((uint8*)si->fbc.frame_buffer - (uint8*)si->framebuffer)); ACCW(NV20_OFFSET0, ((uint8*)si->fbc.frame_buffer - (uint8*)si->framebuffer));
@@ -880,11 +879,23 @@ status_t nv_acc_init_dma()
} }
else else
{ {
/* NV41, 43, 44, 47 */
/* copy some RAM configuration info(?) */ /* copy some RAM configuration info(?) */
ACCW(NV40P_WHAT_T0, NV_REG32(NV32_PFB_CONFIG_0)); if (si->ps.card_type == NV47)
ACCW(NV40P_WHAT_T1, NV_REG32(NV32_PFB_CONFIG_1)); /* or ID == 0x01dx or ID == 0x029x: but no cards defined yet */
ACCW(NV40P_WHAT_T2, NV_REG32(NV32_PFB_CONFIG_0));//updated? {
ACCW(NV40P_WHAT_T3, NV_REG32(NV32_PFB_CONFIG_1));//updated? ACCW(NV47_WHAT_T0, NV_REG32(NV32_PFB_CONFIG_0));
ACCW(NV47_WHAT_T1, NV_REG32(NV32_PFB_CONFIG_1));
}
else
{
/* NV41, 43, 44 */
ACCW(NV40P_WHAT_T0, NV_REG32(NV32_PFB_CONFIG_0));
ACCW(NV40P_WHAT_T1, NV_REG32(NV32_PFB_CONFIG_1));
}
ACCW(NV40P_WHAT_T2, NV_REG32(NV32_PFB_CONFIG_0));
ACCW(NV40P_WHAT_T3, NV_REG32(NV32_PFB_CONFIG_1));
/* setup location of active screen in framebuffer */ /* setup location of active screen in framebuffer */
ACCW(NV40P_OFFSET0, ((uint8*)si->fbc.frame_buffer - (uint8*)si->framebuffer)); ACCW(NV40P_OFFSET0, ((uint8*)si->fbc.frame_buffer - (uint8*)si->framebuffer));
src/add-ons/accelerants/nvidia/engine/nv_general.c
+1 -1
View File
@@ -91,7 +91,7 @@ status_t nv_general_powerup()
{ {
status_t status; status_t status;
LOG(1,("POWERUP: Haiku nVidia Accelerant 0.64 running.\n")); LOG(1,("POWERUP: Haiku nVidia Accelerant 0.65 running.\n"));
/* log VBLANK INT usability status */ /* log VBLANK INT usability status */
if (si->ps.int_assigned) if (si->ps.int_assigned)