diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-03-20 17:44:32 +0100 |
|---|---|---|
| committer | John Doe <glisse@freedesktop.org> | 2008-03-20 17:44:32 +0100 |
| commit | 71b66b00435a10e762a4bb7abedb263196942da4 (patch) | |
| tree | 99bbf149f64f14fdc2cd389ec53188c7ce4e040f /shared-core/nv04_mc.c | |
| parent | 6ef119abf5d19c85fe039fd19d12e9bd64fd44df (diff) | |
| parent | 607964ed9e5f6d86a0960bef2341e7f5de9c71da (diff) | |
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'shared-core/nv04_mc.c')
| -rw-r--r-- | shared-core/nv04_mc.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/shared-core/nv04_mc.c b/shared-core/nv04_mc.c index 766f3a33..24c1f7b3 100644 --- a/shared-core/nv04_mc.c +++ b/shared-core/nv04_mc.c @@ -7,25 +7,12 @@ int nv04_mc_init(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; - uint32_t saved_pci_nv_1, saved_pci_nv_19; - - saved_pci_nv_1 = NV_READ(NV04_PBUS_PCI_NV_1); - saved_pci_nv_19 = NV_READ(NV04_PBUS_PCI_NV_19); - - /* clear busmaster bit */ - NV_WRITE(NV04_PBUS_PCI_NV_1, saved_pci_nv_1 & ~(0x00000001 << 2)); - /* clear SBA and AGP bits */ - NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff0ff); /* Power up everything, resetting each individual unit will * be done later if needed. */ NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF); - /* and restore (gives effect of resetting AGP) */ - NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19); - NV_WRITE(NV04_PBUS_PCI_NV_1, saved_pci_nv_1); - return 0; } |