diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_instmem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_instmem.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 4f95a1e5822e..a7c12c94a5a6 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -305,9 +305,9 @@ struct nv50_gpuobj_node {  	u32 align;  }; -  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; @@ -336,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); @@ -345,7 +345,7 @@ nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align)  		}  		nouveau_vm_map(&node->chan_vma, node->vram); -		gpuobj->vinst = node->chan_vma.offset; +		gpuobj->linst = node->chan_vma.offset;  	}  	gpuobj->size = size; | 
