aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/core/engine/fifo
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-03-04 13:01:21 +1000
committerBen Skeggs <bskeggs@redhat.com>2013-07-01 13:44:04 +1000
commitdceef5d87cc01358cc1434416f3272e2ddc3d97a (patch)
tree6d073077600739f296087e0e38d65e21d7074873 /drivers/gpu/drm/nouveau/core/engine/fifo
parentdrm/nouveau/clk: change init ordering, no longer needed by devinit (diff)
downloadlinux-dev-dceef5d87cc01358cc1434416f3272e2ddc3d97a.tar.xz
linux-dev-dceef5d87cc01358cc1434416f3272e2ddc3d97a.zip
drm/nouveau/fb: initialise vram controller as pfb sub-object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/fifo')
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
index 2b1f91721225..5c7433d5069f 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
@@ -320,7 +320,7 @@ nv40_fifo_init(struct nouveau_object *object)
break;
default:
nv_wr32(priv, 0x002230, 0x00000000);
- nv_wr32(priv, 0x002220, ((pfb->ram.size - 512 * 1024 +
+ nv_wr32(priv, 0x002220, ((pfb->ram->size - 512 * 1024 +
priv->ramfc->addr) >> 16) |
0x00030000);
break;