This patch alone, so ignore the 3/3. I think this fixes the channel unload hang issues in a less obscure way. Feedback appreciated as usual.
On Mon, Jan 11, 2010 at 9:18 PM, Maarten Maathuis <madman2...@gmail.com> wrote: > - This should fix the problem with gpu hangs people have had when closing > channels. > > Signed-off-by: Maarten Maathuis <madman2...@gmail.com> > --- > drivers/gpu/drm/nouveau/nv50_graph.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c > b/drivers/gpu/drm/nouveau/nv50_graph.c > index 444a46b..d6897cf 100644 > --- a/drivers/gpu/drm/nouveau/nv50_graph.c > +++ b/drivers/gpu/drm/nouveau/nv50_graph.c > @@ -282,6 +282,7 @@ nv50_graph_unload_context(struct drm_device *dev) > return 0; > inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE; > > + nouveau_wait_for_idle(dev); > nv_wr32(dev, 0x400500, fifo & ~1); > nv_wr32(dev, 0x400784, inst); > nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) | 0x20); > -- > 1.6.6 > > _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau