From 4186f7bbf8005781a1afca5092624cf2f8e22a0d Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 11 Jul 2012 18:10:11 +1000 Subject: [PATCH] --- yaml --- r: 329613 b: refs/heads/master c: 0134a97979a0abc1c756b0fe491e074693c2bdf5 h: refs/heads/master i: 329611: 0ec2f6d90c45d29724ea7d24c4b5e4d8c2372285 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index be01c779f176..bb4338c8c448 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 496734bf0391f38c196e16dbbfaaeda8e6ec5845 +refs/heads/master: 0134a97979a0abc1c756b0fe491e074693c2bdf5 diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c index d9b346333a44..5965eb7cf390 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c +++ b/trunk/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;