projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7714455
)
drm/nouveau: Disable PROM access on init.
author
Francisco Jerez
<currojerez@riseup.net>
Sat, 10 Jul 2010 16:10:59 +0000
(18:10 +0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 13 Jul 2010 00:13:58 +0000
(10:13 +1000)
On older cards (<nv17) scanout gets blocked when the ROM is being
accessed. PROM access usually comes out enabled from suspend, switch
it off.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv04_mc.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv04_mc.c
b/drivers/gpu/drm/nouveau/nv04_mc.c
index
617ed1e
..
2af43a1
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv04_mc.c
+++ b/
drivers/gpu/drm/nouveau/nv04_mc.c
@@
-11,6
+11,10
@@
nv04_mc_init(struct drm_device *dev)
*/
nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
+
+ /* Disable PROM access. */
+ nv_wr32(dev, NV_PBUS_PCI_NV_20, NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED);
+
return 0;
}