diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-13 09:21:22 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 05:12:51 +0200 |
| commit | 73a60c0d218a292f8ef29d3467726ff26ed366fc (patch) | |
| tree | 92e29ec2b7cbb3b501ac8a56d6f9e3f5bd2c957d /drivers/gpu/drm/nouveau/nouveau_gpuobj.c | |
| parent | drm/nouveau/gpuobj: create wrapper functions for mapping gpuobj into vm/bar (diff) | |
| download | linux-73a60c0d218a292f8ef29d3467726ff26ed366fc.tar.xz linux-73a60c0d218a292f8ef29d3467726ff26ed366fc.zip | |
drm/nouveau/gpuobj: remove flags for vm-mappings
Having GPUOBJ and VM intertwined like this makes it *really* hard to
continue porting to the new driver architecture, split it out in
favour of requiring explit maps be the caller.
It's more flexible and obvious this way anyway...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gpuobj.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gpuobj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c index 4f8020d565a5..79f1d1ef3798 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c +++ b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c @@ -162,7 +162,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan, list_add_tail(&gpuobj->list, &dev_priv->gpuobj_list); spin_unlock(&dev_priv->ramin_lock); - if (!(flags & NVOBJ_FLAG_VM) && chan) { + if (chan) { ramin = drm_mm_search_free(&chan->ramin_heap, size, align, 0); if (ramin) ramin = drm_mm_get_block(ramin, size, align); |