diff options
Diffstat (limited to 'src/nv10_exa.c')
-rw-r--r-- | src/nv10_exa.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nv10_exa.c b/src/nv10_exa.c index a3425a8..d74b052 100644 --- a/src/nv10_exa.c +++ b/src/nv10_exa.c | |||
@@ -725,18 +725,18 @@ NVAccelInitNV10TCL(ScrnInfoPtr pScrn) | |||
725 | NVPtr pNv = NVPTR(pScrn); | 725 | NVPtr pNv = NVPTR(pScrn); |
726 | struct nouveau_channel *chan = pNv->chan; | 726 | struct nouveau_channel *chan = pNv->chan; |
727 | struct nouveau_grobj *celsius; | 727 | struct nouveau_grobj *celsius; |
728 | uint32_t class = 0, chipset; | 728 | uint32_t class = 0; |
729 | int i; | 729 | int i; |
730 | 730 | ||
731 | chipset = (nvReadMC(pNv, NV_PMC_BOOT_0) >> 20) & 0xff; | 731 | if (((pNv->NVArch & 0xf0) != NV_ARCH_10) && |
732 | if (((chipset & 0xf0) != NV_ARCH_10) && ((chipset & 0xf0) != NV_ARCH_20)) | 732 | ((pNv->NVArch & 0xf0) != NV_ARCH_20)) |
733 | return FALSE; | 733 | return FALSE; |
734 | 734 | ||
735 | if (chipset >= 0x20 || chipset == 0x1a) | 735 | if (pNv->NVArch >= 0x20 || pNv->NVArch == 0x1a) |
736 | class = NV11TCL; | 736 | class = NV11TCL; |
737 | else if (chipset >= 0x17) | 737 | else if (pNv->NVArch >= 0x17) |
738 | class = NV17TCL; | 738 | class = NV17TCL; |
739 | else if (chipset >= 0x11) | 739 | else if (pNv->NVArch >= 0x11) |
740 | class = NV11TCL; | 740 | class = NV11TCL; |
741 | else | 741 | else |
742 | class = NV10TCL; | 742 | class = NV10TCL; |