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

added some PTIMER stuff for NV28, apparantly has no (speed) effects.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9460 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2004-10-23 16:41:54 +00:00
parent 8c3666d980
commit 9d964556cc
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/nvidia/engine/nv_acc.c
+2
View File
@@ -37,10 +37,12 @@ status_t nv_acc_init()
uint16 cnt; uint16 cnt;
/* setup PTIMER: */ /* setup PTIMER: */
//fixme? how about NV28 setup as just after coldstarting? (see nv_info.c)
/* set timer numerator to 8 (in b0-15) */ /* set timer numerator to 8 (in b0-15) */
ACCW(PT_NUMERATOR, 0x00000008); ACCW(PT_NUMERATOR, 0x00000008);
/* set timer denominator to 3 (in b0-15) */ /* set timer denominator to 3 (in b0-15) */
ACCW(PT_DENOMINATR, 0x00000003); ACCW(PT_DENOMINATR, 0x00000003);
/* disable timer-alarm INT requests (b0) */ /* disable timer-alarm INT requests (b0) */
ACCW(PT_INTEN, 0x00000000); ACCW(PT_INTEN, 0x00000000);
/* reset timer-alarm INT status bit (b0) */ /* reset timer-alarm INT status bit (b0) */
src/add-ons/accelerants/nvidia/engine/nv_info.c
+9 -17
View File
@@ -262,9 +262,6 @@ static status_t coldstart_card(uint8* rom, uint16 init1, uint16 init2, uint16 in
nv_crtc2_cursor_hide(); nv_crtc2_cursor_hide();
} }
/* make sure AGP mode is OFF */
//fixme: if needed only, and via AGP manager!!
/* execute BIOS coldstart script(s) */ /* execute BIOS coldstart script(s) */
if (init1 || init2) if (init1 || init2)
{ {
@@ -343,9 +340,6 @@ static status_t coldstart_card_516_up(uint8* rom, PinsTables tabs, uint16 ram_ta
nv_crtc2_cursor_hide(); nv_crtc2_cursor_hide();
} }
/* make sure AGP mode is OFF */
//fixme: if needed only, and via AGP manager!!
/* execute all BIOS coldstart script(s) */ /* execute all BIOS coldstart script(s) */
if (tabs.InitScriptTablePtr) if (tabs.InitScriptTablePtr)
{ {
@@ -368,10 +362,16 @@ static status_t coldstart_card_516_up(uint8* rom, PinsTables tabs, uint16 ram_ta
adress = *((uint16*)(&(rom[index]))); adress = *((uint16*)(&(rom[index])));
} }
/* get NV28 RAM access up and running */ /* do some NV28 specific extra stuff */
//fixme?: works on at least one NV28... how about other cards? //fixme: NV28 only??
if (si->ps.card_type == NV28) if (si->ps.card_type == NV28)
{ {
/* setup PTIMER */
ACCW(PT_NUMERATOR, (si->ps.std_engine_clock * 20));
ACCW(PT_DENOMINATR, 0x00000271);
/* get NV28 RAM access up and running */
//fixme?: works on at least one NV28... how about other cards?
NV_REG32(NV32_FB_MRS2) = fb_mrs2; NV_REG32(NV32_FB_MRS2) = fb_mrs2;
NV_REG32(NV32_FB_MRS1) = fb_mrs1; NV_REG32(NV32_FB_MRS1) = fb_mrs1;
} }
@@ -404,7 +404,7 @@ static status_t exec_type1_script(uint8* rom, uint16 adress, int16* size, uint16
bool end = false; bool end = false;
bool exec = true; bool exec = true;
uint8 index, byte; uint8 index, byte;
uint32 reg, data, data2, and_out, or_in;//, safe32; uint32 reg, data, data2, and_out, or_in;
LOG(8,("\nINFO: executing type1 script at adress $%04x...\n", adress)); LOG(8,("\nINFO: executing type1 script at adress $%04x...\n", adress));
LOG(8,("INFO: ---Executing following command(s):\n")); LOG(8,("INFO: ---Executing following command(s):\n"));
@@ -500,12 +500,8 @@ static status_t exec_type1_script(uint8* rom, uint16 adress, int16* size, uint16
LOG(8,("cmd 'WR 32bit reg $%08x = $%08x, then = $%08x' (always done)\n", LOG(8,("cmd 'WR 32bit reg $%08x = $%08x, then = $%08x' (always done)\n",
reg, data, data2)); reg, data, data2));
/* always done */ /* always done */
//remove.. illegal!?
//safe32 = CFGR(AGPCMD);
//CFGW(AGPCMD, 0x00000000);
NV_REG32(reg) = data; NV_REG32(reg) = data;
NV_REG32(reg) = data2; NV_REG32(reg) = data2;
//CFGW(AGPCMD, safe32);
CFGW(ROMSHADOW, (CFGR(ROMSHADOW) & 0xfffffffe)); CFGW(ROMSHADOW, (CFGR(ROMSHADOW) & 0xfffffffe));
break; break;
case 0x69: case 0x69:
@@ -1281,12 +1277,8 @@ static status_t exec_type2_script_mode(uint8* rom, uint16* adress, int16* size,
LOG(8,("cmd 'WR 32bit reg $%08x = $%08x, then = $%08x' (always done)\n", LOG(8,("cmd 'WR 32bit reg $%08x = $%08x, then = $%08x' (always done)\n",
reg, data, data2)); reg, data, data2));
/* always done */ /* always done */
//remove.. illegal!?
//safe32 = CFGR(AGPCMD);
//CFGW(AGPCMD, 0x00000000);
NV_REG32(reg) = data; NV_REG32(reg) = data;
NV_REG32(reg) = data2; NV_REG32(reg) = data2;
//CFGW(AGPCMD, safe32);
CFGW(ROMSHADOW, (CFGR(ROMSHADOW) & 0xfffffffe)); CFGW(ROMSHADOW, (CFGR(ROMSHADOW) & 0xfffffffe));
break; break;
case 0x69: /* identical to type1 */ case 0x69: /* identical to type1 */