diff --git a/[refs] b/[refs] index fdd7deb6bbaf..20c226bf7af7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3461a2bc0d67ce60a915e0f26e2a6eb4a4d4b99 +refs/heads/master: ab699ec64a4294f2f6ccd34b9bf8a2dcb4c4cb3c diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c b/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c index 613f878e6d0f..93711dfcafc1 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -337,7 +337,9 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, return -EINVAL; } + mutex_unlock(&drm_global_mutex); ret = ttm_bo_wait_cpu(&nvbo->bo, false); + mutex_lock(&drm_global_mutex); if (ret) { NV_ERROR(dev, "fail wait_cpu\n"); return ret;