Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2...

[pandora-kernel.git] / drivers / gpu / drm / nouveau / nvc0_grctx.c

diff --git a/drivers/gpu/drm/nouveau/nvc0_grctx.c b/drivers/gpu/drm/nouveau/nvc0_grctx.c
index fddfab7..f880ff7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_grctx.c
+++ b/drivers/gpu/drm/nouveau/nvc0_grctx.c
@@ -1557,7 +1557,7 @@ nvc0_grctx_generate_unk47xx(struct drm_device *dev)
 }
 
 static void
-nvc0_grctx_generate_unk58xx(struct drm_device *dev)
+nvc0_grctx_generate_shaders(struct drm_device *dev)
 {
        nv_wr32(dev, 0x405800, 0x078000bf);
        nv_wr32(dev, 0x405830, 0x02180000);
@@ -1593,7 +1593,7 @@ nvc0_grctx_generate_unk64xx(struct drm_device *dev)
 }
 
 static void
-nvc0_grctx_generate_unk78xx(struct drm_device *dev)
+nvc0_grctx_generate_tpbus(struct drm_device *dev)
 {
        nv_wr32(dev, 0x407804, 0x00000023);
        nv_wr32(dev, 0x40780c, 0x0a418820);
@@ -1606,7 +1606,7 @@ nvc0_grctx_generate_unk78xx(struct drm_device *dev)
 }
 
 static void
-nvc0_grctx_generate_unk80xx(struct drm_device *dev)
+nvc0_grctx_generate_ccache(struct drm_device *dev)
 {
        nv_wr32(dev, 0x408000, 0x00000000);
        nv_wr32(dev, 0x408004, 0x00000000);
@@ -1801,7 +1801,7 @@ nvc0_grctx_generate(struct nouveau_channel *chan)
        struct nvc0_graph_chan *grch = chan->pgraph_ctx;
        struct drm_device *dev = chan->dev;
        int i, gpc, tp, id;
-       u32 r000260;
+       u32 r000260, tmp;
 
        r000260 = nv_rd32(dev, 0x000260);
        nv_wr32(dev, 0x000260, r000260 & ~1);
@@ -1811,11 +1811,11 @@ nvc0_grctx_generate(struct nouveau_channel *chan)
        nvc0_grctx_generate_macro(dev);
        nvc0_grctx_generate_m2mf(dev);
        nvc0_grctx_generate_unk47xx(dev);
-       nvc0_grctx_generate_unk58xx(dev);
+       nvc0_grctx_generate_shaders(dev);
        nvc0_grctx_generate_unk60xx(dev);
        nvc0_grctx_generate_unk64xx(dev);
-       nvc0_grctx_generate_unk78xx(dev);
-       nvc0_grctx_generate_unk80xx(dev);
+       nvc0_grctx_generate_tpbus(dev);
+       nvc0_grctx_generate_ccache(dev);
        nvc0_grctx_generate_rop(dev);
        nvc0_grctx_generate_gpc(dev);
        nvc0_grctx_generate_tp(dev);
@@ -1830,7 +1830,7 @@ nvc0_grctx_generate(struct nouveau_channel *chan)
 
        for (tp = 0, id = 0; tp < 4; tp++) {
                for (gpc = 0; gpc < priv->gpc_nr; gpc++) {
-                       if (tp <= priv->tp_nr[gpc]) {
+                       if (tp < priv->tp_nr[gpc]) {
                                nv_wr32(dev, TP_UNIT(gpc, tp, 0x698), id);
                                nv_wr32(dev, TP_UNIT(gpc, tp, 0x4e8), id);
                                nv_wr32(dev, GPC_UNIT(gpc, 0x0c10 + tp * 4), id);
@@ -1843,8 +1843,12 @@ nvc0_grctx_generate(struct nouveau_channel *chan)
                }
        }
 
-       nv_wr32(dev, 0x406028, 0x00000443);
-       nv_wr32(dev, 0x405870, 0x00000443);
+       tmp = 0;
+       for (i = 0; i < priv->gpc_nr; i++)
+               tmp |= priv->tp_nr[i] << (i * 4);
+       nv_wr32(dev, 0x406028, tmp);
+       nv_wr32(dev, 0x405870, tmp);
+
        nv_wr32(dev, 0x40602c, 0x00000000);
        nv_wr32(dev, 0x405874, 0x00000000);
        nv_wr32(dev, 0x406030, 0x00000000);