summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nv_driver.c4
-rw-r--r--src/nv_hw.c6
-rw-r--r--src/nv_setup.c1
3 files changed, 7 insertions, 4 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 5e9ec41..b82c049 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -87,7 +87,7 @@ _X_EXPORT DriverRec NV = {
0
};
-/* Known cards as of 2005/08/31 */
+/* Known cards as of 2005/09/21 */
static SymTabRec NVKnownChipsets[] =
{
@@ -300,7 +300,7 @@ static SymTabRec NVKnownChipsets[] =
{ 0x10DE0092, "GeForce 7800 GT" },
{ 0x10DE0093, "0x0093" },
{ 0x10DE0094, "0x0094" },
- { 0x10DE0098, "0x0098" },
+ { 0x10DE0098, "GeForce Go 7800" },
{ 0x10DE0099, "GeForce Go 7800 GTX" },
{ 0x10DE009C, "0x009C" },
{ 0x10DE009D, "Quadro FX 4500" },
diff --git a/src/nv_hw.c b/src/nv_hw.c
index cd7ee5a..4fcdc79 100644
--- a/src/nv_hw.c
+++ b/src/nv_hw.c
@@ -1173,8 +1173,10 @@ void NVLoadStateExt (
pNv->PGRAPH[0x0610/4] = 0x00be3c5f;
j = pNv->REGS[0x1540/4] & 0xff;
- for(i = 0; !(j & 1); j >>= 1, i++);
- pNv->PGRAPH[0x5000/4] = i;
+ if(j) {
+ for(i = 0; !(j & 1); j >>= 1, i++);
+ pNv->PGRAPH[0x5000/4] = i;
+ }
if((pNv->Chipset & 0xfff0) == 0x0040) {
pNv->PGRAPH[0x09b0/4] = 0x83280fff;
diff --git a/src/nv_setup.c b/src/nv_setup.c
index 1d8b536..c7a0e86 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -447,6 +447,7 @@ NVCommonSetup(ScrnInfoPtr pScrn)
case 0x0144:
case 0x0146:
case 0x0148:
+ case 0x0098:
case 0x0099:
mobile = TRUE;
break;