Attachment 38258 Details for Bug 29809 – nouveau_pushbuf_deadlock.patch

[patch] nouveau_pushbuf_deadlock.patch

nouveau_pushbuf_deadlock.patch (text/plain), 1.31 KB, created by Francisco Jerez on 2010-08-29 03:57:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco Jerez

Created: 2010-08-29 03:57:38 UTC

Size: 1.31 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
>index 581c67c..ead7b8f 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
>@@ -245,7 +245,7 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence)
> 		list_del(&nvbo->entry);
> 		nvbo->reserved_by = NULL;
> 		ttm_bo_unreserve(&nvbo->bo);
>-		drm_gem_object_unreference(nvbo->gem);
>+		drm_gem_object_unreference_unlocked(nvbo->gem);
> 	}
> }
> 
>@@ -300,7 +300,7 @@ retry:
> 			validate_fini(op, NULL);
> 			if (ret == -EAGAIN)
> 				ret = ttm_bo_wait_unreserved(&nvbo->bo, false);
>-			drm_gem_object_unreference(gem);
>+			drm_gem_object_unreference_unlocked(gem);
> 			if (ret) {
> 				NV_ERROR(dev, "fail reserve\n");
> 				return ret;
>@@ -616,8 +616,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
> 		return PTR_ERR(bo);
> 	}
> 
>-	mutex_lock(&dev->struct_mutex);
>-
> 	/* Mark push buffers as being used on PFIFO, the validation code
> 	 * will then make sure that if the pushbuf bo moves, that they
> 	 * happen on the kernel channel, which will in turn cause a sync
>@@ -731,7 +729,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
> out:
> 	validate_fini(&op, fence);
> 	nouveau_fence_unref((void**)&fence);
>-	mutex_unlock(&dev->struct_mutex);
> 	kfree(bo);
> 	kfree(push);
>

Actions: View | Splinter Review

Attachments on bug 29809: 38258

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.