diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-10 12:22:52 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-25 06:45:55 +1000 |
| commit | d5f423947a11103c43ad26ebb680d049c2d8edd6 (patch) | |
| tree | 8ca591a7ea0de3c957f34d0e63f8b9f0a5addaa0 /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | b5e2f0769a64046cefbfc307cbe6f7fa40dddf10 (diff) | |
| download | lwn-d5f423947a11103c43ad26ebb680d049c2d8edd6.tar.gz lwn-d5f423947a11103c43ad26ebb680d049c2d8edd6.zip | |
drm/nouveau: rename nouveau_vram to nouveau_mem
This structure will also be used for GART in the near future.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index b90383fd18fd..ff5fe28b467b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -710,7 +710,7 @@ nouveau_vram_manager_del(struct ttm_mem_type_manager *man, { struct drm_nouveau_private *dev_priv = nouveau_bdev(man->bdev); struct nouveau_vram_engine *vram = &dev_priv->engine.vram; - struct nouveau_vram *node = mem->mm_node; + struct nouveau_mem *node = mem->mm_node; struct drm_device *dev = dev_priv->dev; if (node->tmp_vma.node) { @@ -718,7 +718,7 @@ nouveau_vram_manager_del(struct ttm_mem_type_manager *man, nouveau_vm_put(&node->tmp_vma); } - vram->put(dev, (struct nouveau_vram **)&mem->mm_node); + vram->put(dev, (struct nouveau_mem **)&mem->mm_node); } static int @@ -731,7 +731,7 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man, struct nouveau_vram_engine *vram = &dev_priv->engine.vram; struct drm_device *dev = dev_priv->dev; struct nouveau_bo *nvbo = nouveau_bo(bo); - struct nouveau_vram *node; + struct nouveau_mem *node; u32 size_nc = 0; int ret; |