diff options
| author | Ben Skeggs | 2013-03-04 04:01:21 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2013-07-01 05:44:04 +0200 |
| commit | dceef5d87cc01358cc1434416f3272e2ddc3d97a (patch) | |
| tree | 6d073077600739f296087e0e38d65e21d7074873 /drivers/gpu/drm/nouveau/nouveau_chan.c | |
| parent | drm/nouveau/clk: change init ordering, no longer needed by devinit (diff) | |
| download | kernel-qcow2-linux-dceef5d87cc01358cc1434416f3272e2ddc3d97a.tar.gz kernel-qcow2-linux-dceef5d87cc01358cc1434416f3272e2ddc3d97a.tar.xz kernel-qcow2-linux-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/nouveau_chan.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index eaa80a2b81ee..e84f4c32331b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -147,7 +147,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nouveau_cli *cli, args.limit = client->vm->vmm->limit - 1; } else if (chan->push.buffer->bo.mem.mem_type == TTM_PL_VRAM) { - u64 limit = pfb->ram.size - imem->reserved - 1; + u64 limit = pfb->ram->size - imem->reserved - 1; if (device->card_type == NV_04) { /* nv04 vram pushbuf hack, retarget to its location in * the framebuffer bar rather than direct vram access.. @@ -282,7 +282,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) } else { args.flags = NV_DMA_TARGET_VRAM | NV_DMA_ACCESS_RDWR; args.start = 0; - args.limit = pfb->ram.size - imem->reserved - 1; + args.limit = pfb->ram->size - imem->reserved - 1; } ret = nouveau_object_new(nv_object(client), chan->handle, vram, |