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

agp logging update; new cards update for Xtal det, dualhead det.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9047 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2004-09-23 19:45:30 +00:00
parent 4c2a769c68
commit e703f31b4f
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/nvidia/engine/nv_agp.c
+7 -5
View File
@@ -1,5 +1,5 @@
/* Author: /* Author:
Rudolf Cornelissen 6/2004-7/2004 Rudolf Cornelissen 6/2004-9/2004
*/ */
#define MODULE_BIT 0x00000100 #define MODULE_BIT 0x00000100
@@ -124,8 +124,9 @@ status_t nv_agp_setup(void)
ioctl(fd, NV_ENABLE_AGP, &nca, sizeof(nca)); ioctl(fd, NV_ENABLE_AGP, &nca, sizeof(nca));
} }
/* list mode now activated */ /* list mode now activated,
nv_agp_list_active(nca.cmd); * make sure we have the correct speed scheme for logging */
nv_agp_list_active(nca.cmd | (nv_ai.interface.agp_stat & AGP_rate_rev));
/* extra check */ /* extra check */
LOG(4,("AGP: graphics card AGPCMD register readback $%08x\n", CFGR(AGPCMD))); LOG(4,("AGP: graphics card AGPCMD register readback $%08x\n", CFGR(AGPCMD)));
@@ -177,9 +178,10 @@ static void nv_agp_list_info(agp_info ai)
(((ai.interface.agp_stat & AGP_RQ) >> AGP_RQ_shift) + 1))); (((ai.interface.agp_stat & AGP_RQ) >> AGP_RQ_shift) + 1)));
/* /*
list current settings list current settings,
make sure we have the correct speed scheme for logging
*/ */
nv_agp_list_active(ai.interface.agp_cmd); nv_agp_list_active(ai.interface.agp_cmd | (ai.interface.agp_stat & AGP_rate_rev));
} }
static void nv_agp_list_active(uint32 cmd) static void nv_agp_list_active(uint32 cmd)
src/add-ons/accelerants/nvidia/engine/nv_info.c
+11 -3
View File
@@ -28,7 +28,7 @@ static void pinsnv10_arch_fake(void);
static void pinsnv20_arch_fake(void); static void pinsnv20_arch_fake(void);
static void pinsnv30_arch_fake(void); static void pinsnv30_arch_fake(void);
static void getstrap_arch_nv4(void); static void getstrap_arch_nv4(void);
static void getstrap_arch_nv10_20_30(void); static void getstrap_arch_nv10_20_30_40(void);
static status_t pins2_read(uint8 *rom, uint32 offset); static status_t pins2_read(uint8 *rom, uint32 offset);
static status_t pins3_6_read(uint8 *rom, uint32 offset); static status_t pins3_6_read(uint8 *rom, uint32 offset);
static status_t coldstart_card(uint8* rom, uint16 init1, uint16 init2, uint16 init_size, uint16 ram_tab); static status_t coldstart_card(uint8* rom, uint16 init1, uint16 init2, uint16 init_size, uint16 ram_tab);
@@ -1498,7 +1498,7 @@ void fake_pins(void)
getstrap_arch_nv4(); getstrap_arch_nv4();
break; break;
default: default:
getstrap_arch_nv10_20_30(); getstrap_arch_nv10_20_30_40();
break; break;
} }
@@ -2345,7 +2345,7 @@ static void getstrap_arch_nv4(void)
si->ps.secondary_head = false; si->ps.secondary_head = false;
} }
static void getstrap_arch_nv10_20_30(void) static void getstrap_arch_nv10_20_30_40(void)
{ {
uint32 dev_manID = CFGR(DEVID); uint32 dev_manID = CFGR(DEVID);
uint32 strapinfo = NV_REG32(NV32_NV10STRAPINFO); uint32 strapinfo = NV_REG32(NV32_NV10STRAPINFO);
@@ -2407,6 +2407,10 @@ static void getstrap_arch_nv10_20_30(void)
switch (dev_manID & 0xfff0ffff) switch (dev_manID & 0xfff0ffff)
{ {
/* Nvidia cards: */ /* Nvidia cards: */
case 0x004010de:
case 0x00c010de:
case 0x00f010de:
case 0x014010de:
case 0x017010de: case 0x017010de:
case 0x018010de: case 0x018010de:
case 0x01f010de: case 0x01f010de:
@@ -2429,7 +2433,11 @@ static void getstrap_arch_nv10_20_30(void)
switch (dev_manID & 0xfff0ffff) switch (dev_manID & 0xfff0ffff)
{ {
/* Nvidia cards: */ /* Nvidia cards: */
case 0x004010de:
case 0x00c010de:
case 0x00f010de:
case 0x011010de: case 0x011010de:
case 0x014010de:
case 0x017010de: case 0x017010de:
case 0x018010de: case 0x018010de:
case 0x01f010de: case 0x01f010de: