diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2009-03-10 20:17:52 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2009-03-10 20:17:52 +1000 |
| commit | 3fc105f00aa3e2a1d6e9ab130f8928160abcb624 (patch) | |
| tree | 41ff10a79ef3bd6affe6560624ba0ae13fd5dd02 | |
| parent | cce3eb4e26bb765303d177526d70517e56301d98 (diff) | |
nouveau/ppc: no instmem access at BIOS shadow time
| -rw-r--r-- | shared-core/nouveau_state.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index c023557d..a7fff685 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -555,22 +555,18 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) dn = pci_device_to_OF_node(dev->pdev); if (dn) { - int size; + int size, i; #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)) const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size); #else const uint32_t *bios = get_property(dn, "NVDA,BMP", &size); #endif - if (bios) - { + if (bios) { int i; - dev_priv->engine.instmem.prepare_access(dev, true); - for(i=0;i<size;i+=4) - nv_wi32(i, bios[i/4]); - dev_priv->engine.instmem.finish_access(dev); + for(i = 0; i < size; i+=4) + nv_out32(dev_priv->ramin, i, bios[i/4]); DRM_INFO("OF bios successfully copied (%d bytes)\n",size); - } - else + } else DRM_INFO("Unable to get the OF bios\n"); } else |