Attachment 110702 Details for Bug 87179 – possible fix

[patch] possible fix

0001-WIPdrm-wake-up-the-card-if-necessary-during-gem-call.patch (text/plain), 3.03 KB, created by Ben Skeggs on 2014-12-11 00:08:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Skeggs

Created: 2014-12-11 00:08:22 UTC

Size: 3.03 KB

patch

obsolete

>From ec7d76f8f27e4fbd967c41599568f730e50fbbc7 Mon Sep 17 00:00:00 2001
>From: Ben Skeggs <bskeggs@redhat.com>
>Date: Thu, 11 Dec 2014 10:05:00 +1000
>Subject: [PATCH] WIPdrm: wake up the card if necessary during gem callbacks
>
>The failure paths if we fail to wake the card are less than desirable,
>but there's not really a graceful way to handle this case currently.
>
>I'll keep this situation in mind when I get to fixing other vm-related
>issues.
>
>WIP: not at all tested
>
>Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
>---
> drm/nouveau_gem.c | 35 ++++++++++++++++++++++++++++++-----
> 1 file changed, 30 insertions(+), 5 deletions(-)
>
>diff --git a/drm/nouveau_gem.c b/drm/nouveau_gem.c
>index 28d51a2..5922d2e 100644
>--- a/drm/nouveau_gem.c
>+++ b/drm/nouveau_gem.c
>@@ -36,7 +36,14 @@ void
> nouveau_gem_object_del(struct drm_gem_object *gem)
> {
> 	struct nouveau_bo *nvbo = nouveau_gem_object(gem);
>+	struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);
> 	struct ttm_buffer_object *bo = &nvbo->bo;
>+	struct device *dev = drm->dev->dev;
>+	int ret;
>+
>+	ret = pm_runtime_get_sync(dev);
>+	if (WARN_ON(ret < 0 && ret != -EACCES))
>+		return;
> 
> 	if (gem->import_attach)
> 		drm_prime_gem_destroy(gem, nvbo->bo.sg);
>@@ -46,6 +53,9 @@ nouveau_gem_object_del(struct drm_gem_object *gem)
> 	/* reset filp so nouveau_bo_del_ttm() can test for it */
> 	gem->filp = NULL;
> 	ttm_bo_unref(&bo);
>+
>+	pm_runtime_mark_last_busy(dev);
>+	pm_runtime_put_autosuspend(dev);
> }
> 
> int
>@@ -53,7 +63,9 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv)
> {
> 	struct nouveau_cli *cli = nouveau_cli(file_priv);
> 	struct nouveau_bo *nvbo = nouveau_gem_object(gem);
>+	struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);
> 	struct nouveau_vma *vma;
>+	struct device *dev = drm->dev->dev;
> 	int ret;
> 
> 	if (!cli->vm)
>@@ -71,11 +83,16 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv)
> 			goto out;
> 		}
> 
>+		ret = pm_runtime_get_sync(dev);
>+		if (ret < 0 && ret != -EACCES)
>+			goto out;
>+
> 		ret = nouveau_bo_vma_add(nvbo, cli->vm, vma);
>-		if (ret) {
>+		if (ret)
> 			kfree(vma);
>-			goto out;
>-		}
>+
>+		pm_runtime_mark_last_busy(dev);
>+		pm_runtime_put_autosuspend(dev);
> 	} else {
> 		vma->refcount++;
> 	}
>@@ -129,6 +146,8 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv)
> {
> 	struct nouveau_cli *cli = nouveau_cli(file_priv);
> 	struct nouveau_bo *nvbo = nouveau_gem_object(gem);
>+	struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);
>+	struct device *dev = drm->dev->dev;
> 	struct nouveau_vma *vma;
> 	int ret;
> 
>@@ -141,8 +160,14 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv)
> 
> 	vma = nouveau_bo_vma_find(nvbo, cli->vm);
> 	if (vma) {
>-		if (--vma->refcount == 0)
>-			nouveau_gem_object_unmap(nvbo, vma);
>+		if (--vma->refcount == 0) {
>+			ret = pm_runtime_get_sync(dev);
>+			if (!WARN_ON(ret < 0 && ret != -EACCES)) {
>+				nouveau_gem_object_unmap(nvbo, vma);
>+				pm_runtime_mark_last_busy(dev);
>+				pm_runtime_put_autosuspend(dev);
>+			}
>+		}
> 	}
> 	ttm_bo_unreserve(&nvbo->bo);
> }
>-- 
>2.2.0
>

Actions: View | Splinter Review

Attachments on bug 87179: 110662 | 110663 | 110702 | 110703

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.