diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2008-01-23 21:32:51 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2008-01-24 15:02:41 -0800 |
| commit | 62ff129257161db99dc4056cf16aa196ccfbc921 (patch) | |
| tree | 508b158d9308624b913ee66f275d9da7b6e9ac96 /src/g80_dac.c | |
| parent | 28f34db87cefdc6b327a98db43da5b4fefe3bdd8 (diff) | |
Fix more load detection false positives.
Diffstat (limited to 'src/g80_dac.c')
| -rw-r--r-- | src/g80_dac.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/g80_dac.c b/src/g80_dac.c index 282436b..0d72d9d 100644 --- a/src/g80_dac.c +++ b/src/g80_dac.c @@ -136,23 +136,22 @@ G80DacLoadDetect(xf86OutputPtr output) const int scrnIndex = pScrn->scrnIndex; const int dacOff = 2048 * pPriv->or; int sigstate; - CARD32 load, tmp, tmp2; + CARD32 load, tmp; xf86DrvMsg(scrnIndex, X_PROBED, "Trying load detection on VGA%i ... ", pPriv->or); pNv->reg[(0x0061A010+dacOff)/4] = 0x00000001; - tmp2 = pNv->reg[(0x0061A004+dacOff)/4]; + tmp = pNv->reg[(0x0061A004+dacOff)/4]; pNv->reg[(0x0061A004+dacOff)/4] = 0x80150000; while(pNv->reg[(0x0061A004+dacOff)/4] & 0x80000000); - tmp = pNv->architecture == 0x50 ? 420 : 340; - pNv->reg[(0x0061A00C+dacOff)/4] = tmp | 0x100000; + pNv->reg[(0x0061A00C+dacOff)/4] = pNv->loadVal | 0x100000; sigstate = xf86BlockSIGIO(); usleep(45000); xf86UnblockSIGIO(sigstate); load = pNv->reg[(0x0061A00C+dacOff)/4]; pNv->reg[(0x0061A00C+dacOff)/4] = 0; - pNv->reg[(0x0061A004+dacOff)/4] = 0x80000000 | tmp2; + pNv->reg[(0x0061A004+dacOff)/4] = 0x80000000 | tmp; // Use this DAC if all three channels show load. if((load & 0x38000000) == 0x38000000) { |