drm/nv50: Remove redundant/incorrect ctxvals initialisation.
authorMarcin Kościelnicki <koriakin@0x04.net>
Thu, 25 Feb 2010 18:53:37 +0000 (18:53 +0000)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 10 Mar 2010 06:06:40 +0000 (16:06 +1000)
11c/004 offset corresponds to PGRAPH reg 0x400828, and is initialised
earlier anyway by both our ctxprog generator and blob ctxvals. It's
actually incorrect with the generator, since we use different layout
on pre-NVA0.

Signed-off-by: Marcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_graph.c

index 857a096..08d87b7 100644 (file)
@@ -229,10 +229,6 @@ nv50_graph_create_context(struct nouveau_channel *chan)
                nouveau_grctx_vals_load(dev, ctx);
        }
        nv_wo32(dev, ctx, 0x00000/4, chan->ramin->instance >> 12);
-       if ((dev_priv->chipset & 0xf0) == 0xa0)
-               nv_wo32(dev, ctx, 0x00004/4, 0x00000000);
-       else
-               nv_wo32(dev, ctx, 0x0011c/4, 0x00000000);
        dev_priv->engine.instmem.finish_access(dev);
 
        return 0;