Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185505
b: refs/heads/master
c: e32b2c8
h: refs/heads/master
i:
  185503: fadc56f
v: v3
  • Loading branch information
Luca Barbieri authored and Ben Skeggs committed Feb 25, 2010
1 parent 5c81297 commit 662ec43
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: 761c5a69751967f4fe7430eb65b3a0ea92f3b673
refs/heads/master: e32b2c883bfe9b57c660b5db31a62cea96c0c046
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/nouveau/nouveau_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -558,11 +558,11 @@ nouveau_gem_pushbuf_reloc_apply(struct drm_device *dev,

spin_lock(&nvbo->bo.lock);
ret = ttm_bo_wait(&nvbo->bo, false, false, false);
spin_unlock(&nvbo->bo.lock);
if (ret) {
NV_ERROR(dev, "reloc wait_idle failed: %d\n", ret);
break;
}
spin_unlock(&nvbo->bo.lock);

nouveau_bo_wr32(nvbo, r->reloc_bo_offset >> 2, data);
}
Expand Down

0 comments on commit 662ec43

Please sign in to comment.