This is a note to let you know that I've just added the patch titled
drm/nvc0/fence: restore pre-suspend fence buffer context on resume
to the 3.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-nvc0-fence-restore-pre-suspend-fence-buffer-context-on-resume.patch
and it can be found in the queue-3.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From d6ba6d215a538a58f0f0026f0961b0b9125e8042 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bske...@redhat.com>
Date: Fri, 28 Sep 2012 11:50:29 +1000
Subject: drm/nvc0/fence: restore pre-suspend fence buffer context on resume
From: Ben Skeggs <bske...@redhat.com>
commit d6ba6d215a538a58f0f0026f0961b0b9125e8042 upstream.
Fixes some unfortunate races on resume. The G84 version of the code doesn't
need this as "gpuobj"s are automagically suspended/resumed by the core code
whereas pinned buffer objects are not.
Signed-off-by: Ben Skeggs <bske...@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/gpu/drm/nouveau/nvc0_fence.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
--- a/drivers/gpu/drm/nouveau/nvc0_fence.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fence.c
@@ -32,6 +32,7 @@
struct nvc0_fence_priv {
struct nouveau_fence_priv base;
struct nouveau_bo *bo;
+ u32 *suspend;
};
struct nvc0_fence_chan {
@@ -125,12 +126,36 @@ nvc0_fence_context_new(struct nouveau_ch
static int
nvc0_fence_fini(struct drm_device *dev, int engine, bool suspend)
{
+ struct nouveau_fifo_priv *pfifo = nv_engine(dev, NVOBJ_ENGINE_FIFO);
+ struct nvc0_fence_priv *priv = nv_engine(dev, engine);
+ int i;
+
+ if (suspend) {
+ priv->suspend = vmalloc(pfifo->channels * sizeof(u32));
+ if (!priv->suspend)
+ return -ENOMEM;
+
+ for (i = 0; i < pfifo->channels; i++)
+ priv->suspend[i] = nouveau_bo_rd32(priv->bo, i);
+ }
+
return 0;
}
static int
nvc0_fence_init(struct drm_device *dev, int engine)
{
+ struct nouveau_fifo_priv *pfifo = nv_engine(dev, NVOBJ_ENGINE_FIFO);
+ struct nvc0_fence_priv *priv = nv_engine(dev, engine);
+ int i;
+
+ if (priv->suspend) {
+ for (i = 0; i < pfifo->channels; i++)
+ nouveau_bo_wr32(priv->bo, i, priv->suspend[i]);
+ vfree(priv->suspend);
+ priv->suspend = NULL;
+ }
+
return 0;
}
Patches currently in stable-queue which might be from bske...@redhat.com are
queue-3.6/drm-nvc0-fence-restore-pre-suspend-fence-buffer-context-on-resume.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
