Attachment 40400 Details for Bug 31637 – nouveau_grobj_sync.patch

[patch] nouveau_grobj_sync.patch

nouveau_grobj_sync.patch (text/plain), 3.88 KB, created by Francisco Jerez on 2010-11-18 14:11:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco Jerez

Created: 2010-11-18 14:11:38 UTC

Size: 3.88 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
>index 0f33132..3e49bab 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
>@@ -284,7 +284,6 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan)
> 	struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
> 	struct nouveau_crypt_engine *pcrypt = &dev_priv->engine.crypt;
> 	unsigned long flags;
>-	int ret;
> 
> 	/* decrement the refcount, and we're done if there's still refs */
> 	if (likely(!atomic_dec_and_test(&chan->users))) {
>@@ -297,19 +296,7 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan)
> 	nouveau_debugfs_channel_fini(chan);
> 
> 	/* give it chance to idle */
>-	nouveau_fence_update(chan);
>-	if (chan->fence.sequence != chan->fence.sequence_ack) {
>-		struct nouveau_fence *fence = NULL;
>-
>-		ret = nouveau_fence_new(chan, &fence, true);
>-		if (ret == 0) {
>-			ret = nouveau_fence_wait(fence, false, false);
>-			nouveau_fence_unref(&fence);
>-		}
>-
>-		if (ret)
>-			NV_ERROR(dev, "Failed to idle channel %d.\n", chan->id);
>-	}
>+	nouveau_channel_idle(chan);
> 
> 	/* ensure all outstanding fences are signaled.  they should be if the
> 	 * above attempts at idling were OK, but if we failed this'll tell TTM
>@@ -388,6 +375,27 @@ nouveau_channel_ref(struct nouveau_channel *chan,
> 	*pchan = chan;
> }
> 
>+void
>+nouveau_channel_idle(struct nouveau_channel *chan)
>+{
>+	struct drm_device *dev = chan->dev;
>+	struct nouveau_fence *fence = NULL;
>+	int ret;
>+
>+	nouveau_fence_update(chan);
>+
>+	if (chan->fence.sequence != chan->fence.sequence_ack) {
>+		ret = nouveau_fence_new(chan, &fence, true);
>+		if (!ret) {
>+			ret = nouveau_fence_wait(fence, false, false);
>+			nouveau_fence_unref(&fence);
>+		}
>+
>+		if (ret)
>+			NV_ERROR(dev, "Failed to idle channel %d.\n", chan->id);
>+	}
>+}
>+
> /* cleans up all the fifos from file_priv */
> void
> nouveau_channel_cleanup(struct drm_device *dev, struct drm_file *file_priv)
>diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
>index 5569238..7d7125f 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
>@@ -197,22 +197,10 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
> 
> 	NV_INFO(dev, "Idling channels...\n");
> 	for (i = 0; i < pfifo->channels; i++) {
>-		struct nouveau_fence *fence = NULL;
>-
> 		chan = dev_priv->channels.ptr[i];
>-		if (!chan || !chan->pushbuf_bo)
>-			continue;
>-
>-		ret = nouveau_fence_new(chan, &fence, true);
>-		if (ret == 0) {
>-			ret = nouveau_fence_wait(fence, false, false);
>-			nouveau_fence_unref(&fence);
>-		}
> 
>-		if (ret) {
>-			NV_ERROR(dev, "Failed to idle channel %d for suspend\n",
>-				 chan->id);
>-		}
>+		if (chan && chan->pushbuf_bo)
>+			nouveau_channel_idle(chan);
> 	}
> 
> 	pgraph->fifo_access(dev, false);
>diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
>index a52b1da..d001453 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
>+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
>@@ -847,6 +847,7 @@ extern void nouveau_channel_put_unlocked(struct nouveau_channel **);
> extern void nouveau_channel_put(struct nouveau_channel **);
> extern void nouveau_channel_ref(struct nouveau_channel *chan,
> 				struct nouveau_channel **pchan);
>+extern void nouveau_channel_idle(struct nouveau_channel *chan);
> 
> /* nouveau_object.c */
> #define NVOBJ_CLASS(d,c,e) do {                                                \
>diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
>index e5733ee..2e8773b 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_object.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
>@@ -1014,6 +1014,8 @@ int nouveau_ioctl_gpuobj_free(struct drm_device *dev, void *data,
> 	if (IS_ERR(chan))
> 		return PTR_ERR(chan);
> 
>+	nouveau_channel_idle(chan);
>+
> 	ret = nouveau_ramht_remove(chan, objfree->handle);
> 	nouveau_channel_put(&chan);
> 	return ret;

Actions: View | Splinter Review

Attachments on bug 31637: 40285 | 40400 | 40403 | 40409 | 40434

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.