Merge branch 'core/debug' into core/urgent

[~andy/linux] / drivers / gpu / drm / nouveau / nv20_graph.c

diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c
index 385e2b49a554e7c9b1e1e9db9158d9d9e5e0d3fe..e34ea30758f67f19825e8ba401d0f5904c9e49a5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv20_graph.c
+++ b/drivers/gpu/drm/nouveau/nv20_graph.c
@@ -43,8 +43,6 @@ struct nv20_graph_engine {
 int
 nv20_graph_unload_context(struct drm_device *dev)
 {
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
        struct nouveau_channel *chan;
        struct nouveau_gpuobj *grctx;
        u32 tmp;
@@ -62,7 +60,7 @@ nv20_graph_unload_context(struct drm_device *dev)
 
        nv_wr32(dev, NV10_PGRAPH_CTX_CONTROL, 0x10000000);
        tmp  = nv_rd32(dev, NV10_PGRAPH_CTX_USER) & 0x00ffffff;
-       tmp |= (pfifo->channels - 1) << 24;
+       tmp |= 31 << 24;
        nv_wr32(dev, NV10_PGRAPH_CTX_USER, tmp);
        return 0;
 }