projects
/
profile
/
ivi
/
libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bfd09f
)
nouveau: AGP reset correction - don't touch FW bit
author
Stuart Bennett
<sb476@cam.ac.uk>
Mon, 7 Jan 2008 17:38:18 +0000
(17:38 +0000)
committer
Stuart Bennett
<sb476@cam.ac.uk>
Tue, 8 Jan 2008 20:30:21 +0000
(20:30 +0000)
shared-core/nv04_mc.c
patch
|
blob
|
history
diff --git
a/shared-core/nv04_mc.c
b/shared-core/nv04_mc.c
index
a6a2045
..
766f3a3
100644
(file)
--- a/
shared-core/nv04_mc.c
+++ b/
shared-core/nv04_mc.c
@@
-14,8
+14,8
@@
nv04_mc_init(struct drm_device *dev)
/* clear busmaster bit */
NV_WRITE(NV04_PBUS_PCI_NV_1, saved_pci_nv_1 & ~(0x00000001 << 2));
- /* clear SBA
, AGP and FW
bits */
- NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff0
0
f);
+ /* clear SBA
and AGP
bits */
+ NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff0
f
f);
/* Power up everything, resetting each individual unit will
* be done later if needed.