Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 329613
b: refs/heads/master
c: 0134a97
h: refs/heads/master
i:
  329611: 0ec2f6d
v: v3
  • Loading branch information
Ben Skeggs committed Oct 3, 2012
1 parent da06f0c commit 4186f7b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 496734bf0391f38c196e16dbbfaaeda8e6ec5845
refs/heads/master: 0134a97979a0abc1c756b0fe491e074693c2bdf5
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4186f7b

Please sign in to comment.