diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-06-03 14:23:30 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-06-23 15:59:18 +1000 |
| commit | 6e32fedc8b50d3571bdec4e9849e45659ac96599 (patch) | |
| tree | 3895a1fd7ac7ad7959ea274416b284cdba510c75 /drivers/gpu/drm/nouveau/nvc0_copy.c | |
| parent | dd6a46cc922bec58e9c73782cd59f50a239c4fa7 (diff) | |
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/nvc0_copy.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_copy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_copy.c b/drivers/gpu/drm/nouveau/nvc0_copy.c index 02c00bbeb9e5..5ebcd74244db 100644 --- a/drivers/gpu/drm/nouveau/nvc0_copy.c +++ b/drivers/gpu/drm/nouveau/nvc0_copy.c @@ -48,7 +48,7 @@ nvc0_copy_context_new(struct nouveau_channel *chan, int engine) struct nouveau_gpuobj *ctx = NULL; int ret; - ret = nouveau_gpuobj_new(dev, NULL, 256, 256, + ret = nouveau_gpuobj_new(dev, chan, 256, 256, NVOBJ_FLAG_VM | NVOBJ_FLAG_VM_USER | NVOBJ_FLAG_ZERO_ALLOC, &ctx); if (ret) |