aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-07-08 01:40:18 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-07-12 20:13:50 -0400
commitc50a5681e7d0ce1dd6de06fd70a7eff56ebfb9e9 (patch)
tree6c15d5aefc9e961406e079de47d1adfe7090f8c9 /drivers/gpu/drm/nouveau/nouveau_drv.h
parentac94a343c74fe0504663583a7590e89257214f0d (diff)
drm/nv20-nv30: move context table object out of dev_priv
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index f3dbce20332b..47fa28ddec75 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -333,6 +333,9 @@ struct nouveau_pgraph_engine {
333 bool accel_blocked; 333 bool accel_blocked;
334 int grctx_size; 334 int grctx_size;
335 335
336 /* NV2x/NV3x context table (0x400780) */
337 struct nouveau_gpuobj_ref *ctx_table;
338
336 int (*init)(struct drm_device *); 339 int (*init)(struct drm_device *);
337 void (*takedown)(struct drm_device *); 340 void (*takedown)(struct drm_device *);
338 341
@@ -580,10 +583,6 @@ struct drm_nouveau_private {
580 583
581 struct drm_mm ramin_heap; 584 struct drm_mm ramin_heap;
582 585
583 /* context table pointed to be NV_PGRAPH_CHANNEL_CTX_TABLE (0x400780) */
584 uint32_t ctx_table_size;
585 struct nouveau_gpuobj_ref *ctx_table;
586
587 struct list_head gpuobj_list; 586 struct list_head gpuobj_list;
588 587
589 struct nvbios vbios; 588 struct nvbios vbios;