diff options
| author | Ben Skeggs | 2011-06-03 06:23:30 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2011-06-23 07:59:18 +0200 |
| commit | 6e32fedc8b50d3571bdec4e9849e45659ac96599 (patch) | |
| tree | 3895a1fd7ac7ad7959ea274416b284cdba510c75 /drivers/gpu/drm/nouveau/nv50_instmem.c | |
| parent | drm/nouveau: initialise any vm for a channel before pushbuf/ntfy (diff) | |
| download | kernel-qcow2-linux-6e32fedc8b50d3571bdec4e9849e45659ac96599.tar.gz kernel-qcow2-linux-6e32fedc8b50d3571bdec4e9849e45659ac96599.tar.xz kernel-qcow2-linux-6e32fedc8b50d3571bdec4e9849e45659ac96599.zip | |
drm/nouveau: will need to specify channel for vm-ful gpuobj allocations
Abuses existing gpuobj_new() chan argument for this, which in turn forces
all NVOBJ_FLAG_VM allocations to be done from the global heap, not
suballocated from the channel's private heap. Not a problem though in
practise.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_instmem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_instmem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index ccea671346c9..a7c12c94a5a6 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -306,7 +306,8 @@ struct nv50_gpuobj_node { }; int -nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align) +nv50_instmem_get(struct nouveau_gpuobj *gpuobj, struct nouveau_channel *chan, + u32 size, u32 align) { struct drm_device *dev = gpuobj->dev; struct drm_nouveau_private *dev_priv = dev->dev_private; @@ -335,7 +336,7 @@ nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align) if (!(gpuobj->flags & NVOBJ_FLAG_VM_USER)) flags |= NV_MEM_ACCESS_SYS; - ret = nouveau_vm_get(dev_priv->chan_vm, size, 12, flags, + ret = nouveau_vm_get(chan->vm, size, 12, flags, &node->chan_vma); if (ret) { vram->put(dev, &node->vram); |