diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-07-10 12:10:59 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-12 20:13:58 -0400 |
commit | 112d20ad5ca06a9ec7237602ee33bef6fa881daa (patch) | |
tree | 8adf473785edccb804aadd435cdbc974e9ecfe25 | |
parent | 77144554de9af353795698161af26e36f7cdbbef (diff) |
drm/nouveau: Disable PROM access on init.
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>
-rw-r--r-- | drivers/gpu/drm/nouveau/nv04_mc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_mc.c b/drivers/gpu/drm/nouveau/nv04_mc.c index 617ed1e05269..2af43a1cb2ec 100644 --- 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) | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF); | 13 | nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF); |
14 | |||
15 | /* Disable PROM access. */ | ||
16 | nv_wr32(dev, NV_PBUS_PCI_NV_20, NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED); | ||
17 | |||
14 | return 0; | 18 | return 0; |
15 | } | 19 | } |
16 | 20 | ||