diff options
author | Luca Barbieri <luca@luca-barbieri.com> | 2010-03-30 17:41:57 +0200 |
---|---|---|
committer | Luca Barbieri <luca@luca-barbieri.com> | 2010-03-30 17:41:57 +0200 |
commit | 78a2fd9454f8188a7c58e3e0e662f5ee045c1951 (patch) | |
tree | 9cab8c373e945e0d5394f9547020bec1f8f80d98 | |
parent | 7ac8b116e150a63671bfe2e5dc9e7559c4b32229 (diff) |
.
-rw-r--r-- | nvlib.h | 3 | ||||
-rw-r--r-- | ramfc.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -327,7 +327,6 @@ struct nv_device : public nv_region pci_device_map_range(dev->pci, dev->pci->regions[ramin_bar].base_addr, dev->pci->regions[ramin_bar].size, PCI_DEV_MAP_FLAG_WRITABLE, (void**)&ptr); if (!ptr) throw std::runtime_error("Failed to init RAMIN mapping"); - std::cout << "RAMIN bar " << ramin_bar << " @ " << ptr << ": " << size << std::endl; } /* On older cards (or if the above failed), create a map covering @@ -1070,7 +1069,7 @@ struct nv_device : public nv_region else { uint32_t v = rd32(NV50_PFIFO_CTX_TABLE(channel)); uint32_t fc; - if(chipset == 0x50) + if(chipset < 0x60) fc = v << 12; else fc = v << 8; @@ -13,7 +13,7 @@ int main(int argc, char** argv) continue; if(chans) cout << '\n'; - cout << "Channel " << dec << i << " at " << hex08 << hwchan->fifoctx->offset_in(*dev->ramin); + cout << "Channel " << dec << i << " at " << hex08 << hwchan->fifoctx->offset_in(*hwchan->ramin); for(unsigned j = 0; j < dev->fifoctx_size; j += 4) { if(!(j & 15)) cout << endl; |