From: Ben Skeggs Date: Wed, 11 Jul 2012 08:10:11 +0000 (+1000) Subject: drm/nv50-/instmem: allocate vram for kernel objects from end of vram X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0134a97979a0abc1c756b0fe491e074693c2bdf5;p=deliverable%2Flinux.git drm/nv50-/instmem: allocate vram for kernel objects from end of vram Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c index d9b346333a44..5965eb7cf390 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c @@ -323,7 +323,7 @@ nv50_instmem_get(struct nouveau_gpuobj *gpuobj, struct nouveau_channel *chan, size = (size + 4095) & ~4095; align = max(align, (u32)4096); - ret = vram->get(dev, size, align, 0, 0, &node->vram); + ret = vram->get(dev, size, align, 0, 0x800, &node->vram); if (ret) { kfree(node); return ret;