diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-07-08 15:40:18 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-13 10:13:50 +1000 |
| commit | c50a5681e7d0ce1dd6de06fd70a7eff56ebfb9e9 (patch) | |
| tree | 6c15d5aefc9e961406e079de47d1adfe7090f8c9 /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | ac94a343c74fe0504663583a7590e89257214f0d (diff) | |
| download | lwn-c50a5681e7d0ce1dd6de06fd70a7eff56ebfb9e9.tar.gz lwn-c50a5681e7d0ce1dd6de06fd70a7eff56ebfb9e9.zip | |
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.h | 7 |
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 { 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; |