From 662ec43d597da0e8bb5d479daf9f95ee47916e1a Mon Sep 17 00:00:00 2001 From: Luca Barbieri Date: Sat, 20 Feb 2010 11:08:56 +0100 Subject: [PATCH] --- yaml --- r: 185505 b: refs/heads/master c: e32b2c883bfe9b57c660b5db31a62cea96c0c046 h: refs/heads/master i: 185503: fadc56f5effa1daf6af70c8671a7c8215f070e62 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 231ad8f1a297..156130cc7934 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 761c5a69751967f4fe7430eb65b3a0ea92f3b673 +refs/heads/master: e32b2c883bfe9b57c660b5db31a62cea96c0c046 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c b/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c index fee959c72f40..8265fed528fd 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -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); }