drm/nv20-nv30: move context table object out of dev_priv

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index f3dbce20332b3dcb8be9f8ddaba474ddf19cb6f4..47fa28ddec7566a8d3511efef44adf4deaf58156 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -333,6 +333,9 @@ struct nouveau_pgraph_engine {
        bool accel_blocked;
        int grctx_size;
 
+       /* NV2x/NV3x context table (0x400780) */
+       struct nouveau_gpuobj_ref *ctx_table;
+
        int  (*init)(struct drm_device *);
        void (*takedown)(struct drm_device *);
 
@@ -580,10 +583,6 @@ struct drm_nouveau_private {
 
        struct drm_mm ramin_heap;
 
-       /* context table pointed to be NV_PGRAPH_CHANNEL_CTX_TABLE (0x400780) */
-       uint32_t ctx_table_size;
-       struct nouveau_gpuobj_ref *ctx_table;
-
        struct list_head gpuobj_list;
 
        struct nvbios vbios;

diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c
index 0c776ee81e8542d63b15fa38c34a22d87e63c9c1..17f309b36c910060a355af6d1ada2e6ca6fc7cfd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv20_graph.c
+++ b/drivers/gpu/drm/nouveau/nv20_graph.c
@@ -416,8 +416,8 @@ nv20_graph_create_context(struct nouveau_channel *chan)
        nv_wo32(dev, chan->ramin_grctx->gpuobj, idoffs,
                                        (chan->id << 24) | 0x1); /* CTX_USER */
 
-       nv_wo32(dev, dev_priv->ctx_table->gpuobj, chan->id,
-                       chan->ramin_grctx->instance >> 4);
+       nv_wo32(dev, pgraph->ctx_table->gpuobj, chan->id,
+                    chan->ramin_grctx->instance >> 4);
        return 0;
 }
 
@@ -426,11 +426,12 @@ nv20_graph_destroy_context(struct nouveau_channel *chan)
 {
        struct drm_device *dev = chan->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+       struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
 
        if (chan->ramin_grctx)
                nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
 
-       nv_wo32(dev, dev_priv->ctx_table->gpuobj, chan->id, 0);
+       nv_wo32(dev, pgraph->ctx_table->gpuobj, chan->id, 0);
 }
 
 int
@@ -522,8 +523,7 @@ nv20_graph_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
 int
 nv20_graph_init(struct drm_device *dev)
 {
-       struct drm_nouveau_private *dev_priv =
-               (struct drm_nouveau_private *)dev->dev_private;
+       struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
        uint32_t tmp, vramsz;
        int ret, i;
@@ -550,19 +550,17 @@ nv20_graph_init(struct drm_device *dev)
        nv_wr32(dev, NV03_PMC_ENABLE,
                nv_rd32(dev, NV03_PMC_ENABLE) |  NV_PMC_ENABLE_PGRAPH);
 
-       if (!dev_priv->ctx_table) {
+       if (!pgraph->ctx_table) {
                /* Create Context Pointer Table */
-               dev_priv->ctx_table_size = 32 * 4;
-               ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0,
-                                                 dev_priv->ctx_table_size, 16,
+               ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0, 32 * 4, 16,
                                                  NVOBJ_FLAG_ZERO_ALLOC,
-                                                 &dev_priv->ctx_table);
+                                                 &pgraph->ctx_table);
                if (ret)
                        return ret;
        }
 
        nv_wr32(dev, NV20_PGRAPH_CHANNEL_CTX_TABLE,
-                dev_priv->ctx_table->instance >> 4);
+                    pgraph->ctx_table->instance >> 4);
 
        nv20_graph_rdi(dev);
 
@@ -646,8 +644,9 @@ void
 nv20_graph_takedown(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+       struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
 
-       nouveau_gpuobj_ref_del(dev, &dev_priv->ctx_table);
+       nouveau_gpuobj_ref_del(dev, &pgraph->ctx_table);
 }
 
 int
@@ -680,19 +679,17 @@ nv30_graph_init(struct drm_device *dev)
        nv_wr32(dev, NV03_PMC_ENABLE,
                nv_rd32(dev, NV03_PMC_ENABLE) |  NV_PMC_ENABLE_PGRAPH);
 
-       if (!dev_priv->ctx_table) {
+       if (!pgraph->ctx_table) {
                /* Create Context Pointer Table */
-               dev_priv->ctx_table_size = 32 * 4;
-               ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0,
-                                                 dev_priv->ctx_table_size, 16,
+               ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0, 32 * 4, 16,
                                                  NVOBJ_FLAG_ZERO_ALLOC,
-                                                 &dev_priv->ctx_table);
+                                                 &pgraph->ctx_table);
                if (ret)
                        return ret;
        }
 
        nv_wr32(dev, NV20_PGRAPH_CHANNEL_CTX_TABLE,
-                       dev_priv->ctx_table->instance >> 4);
+                    pgraph->ctx_table->instance >> 4);
 
        nv_wr32(dev, NV03_PGRAPH_INTR   , 0xFFFFFFFF);
        nv_wr32(dev, NV03_PGRAPH_INTR_EN, 0xFFFFFFFF);