aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-11-15 12:52:23 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 15:11:52 +1000
commit9fea1bcbff037cb61f71e0d699180030b1f509a5 (patch)
tree43aefb9c708f8c83208e3d9969bb3a8bea8b0eea
parentdrm/nv50: allocate page for unknown PFB object in nv50_fb.c (diff)
downloadlinux-dev-9fea1bcbff037cb61f71e0d699180030b1f509a5.tar.xz
linux-dev-9fea1bcbff037cb61f71e0d699180030b1f509a5.zip
drm/nv50: fix 0x100c90 init for NVAF
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv50_fb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/nv50_fb.c
index aa6d78366078..50290dea0ac4 100644
--- a/drivers/gpu/drm/nouveau/nv50_fb.c
+++ b/drivers/gpu/drm/nouveau/nv50_fb.c
@@ -60,15 +60,18 @@ nv50_fb_init(struct drm_device *dev)
* on traps. No idea what these values mean exactly. */
switch (dev_priv->chipset) {
case 0x50:
- nv_wr32(dev, 0x100c90, 0x0707ff);
+ nv_wr32(dev, 0x100c90, 0x000707ff);
break;
case 0xa3:
case 0xa5:
case 0xa8:
- nv_wr32(dev, 0x100c90, 0x0d0fff);
+ nv_wr32(dev, 0x100c90, 0x000d0fff);
+ break;
+ case 0xaf:
+ nv_wr32(dev, 0x100c90, 0x089d1fff);
break;
default:
- nv_wr32(dev, 0x100c90, 0x1d07ff);
+ nv_wr32(dev, 0x100c90, 0x001d07ff);
break;
}