summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-11-16 01:13:05 +0100
committerBen Skeggs <bskeggs@redhat.com>2010-12-08 04:48:17 +0100
commitb571fe21f5c24760368b3fb927af5a7384d7721b (patch)
treea49f85fdf8ef3a3c9b969c0fbbe36c7fd2b6e40d /drivers/gpu/drm/nouveau/nouveau_drv.h
parentdrm/nv50: enable non-contig vram allocations where requested (diff)
downloadlinux-b571fe21f5c24760368b3fb927af5a7384d7721b.tar.xz
linux-b571fe21f5c24760368b3fb927af5a7384d7721b.zip
drm/nv50: tidy up PCIEGART implementation
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.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index dce9a5f6f6c4..4c5fc9c9912b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -248,7 +248,6 @@ struct nouveau_channel {
/* NV50 VM */
struct nouveau_vm *vm;
struct nouveau_gpuobj *vm_pd;
- struct nouveau_gpuobj *vm_gart_pt;
/* Objects */
struct nouveau_gpuobj *ramin; /* Private instmem */
@@ -684,6 +683,7 @@ struct drm_nouveau_private {
uint64_t aper_free;
struct nouveau_gpuobj *sg_ctxdma;
+ struct nouveau_vma vma;
} gart_info;
/* nv10-nv40 tiling regions */
@@ -709,8 +709,6 @@ struct drm_nouveau_private {
/* G8x/G9x virtual address space */
struct nouveau_vm *chan_vm;
- uint64_t vm_gart_base;
- uint64_t vm_gart_size;
struct nvbios vbios;