diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-09 21:22:52 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 15:45:55 -0500 |
commit | d5f423947a11103c43ad26ebb680d049c2d8edd6 (patch) | |
tree | 8ca591a7ea0de3c957f34d0e63f8b9f0a5addaa0 /drivers/gpu/drm/nouveau/nouveau_mm.h | |
parent | b5e2f0769a64046cefbfc307cbe6f7fa40dddf10 (diff) |
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_mm.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.h b/drivers/gpu/drm/nouveau/nouveau_mm.h index 798eaf39691..1f7483aae9a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mm.h +++ b/drivers/gpu/drm/nouveau/nouveau_mm.h | |||
@@ -53,13 +53,13 @@ void nouveau_mm_put(struct nouveau_mm *, struct nouveau_mm_node *); | |||
53 | 53 | ||
54 | int nv50_vram_init(struct drm_device *); | 54 | int nv50_vram_init(struct drm_device *); |
55 | int nv50_vram_new(struct drm_device *, u64 size, u32 align, u32 size_nc, | 55 | int nv50_vram_new(struct drm_device *, u64 size, u32 align, u32 size_nc, |
56 | u32 memtype, struct nouveau_vram **); | 56 | u32 memtype, struct nouveau_mem **); |
57 | void nv50_vram_del(struct drm_device *, struct nouveau_vram **); | 57 | void nv50_vram_del(struct drm_device *, struct nouveau_mem **); |
58 | bool nv50_vram_flags_valid(struct drm_device *, u32 tile_flags); | 58 | bool nv50_vram_flags_valid(struct drm_device *, u32 tile_flags); |
59 | 59 | ||
60 | int nvc0_vram_init(struct drm_device *); | 60 | int nvc0_vram_init(struct drm_device *); |
61 | int nvc0_vram_new(struct drm_device *, u64 size, u32 align, u32 ncmin, | 61 | int nvc0_vram_new(struct drm_device *, u64 size, u32 align, u32 ncmin, |
62 | u32 memtype, struct nouveau_vram **); | 62 | u32 memtype, struct nouveau_mem **); |
63 | bool nvc0_vram_flags_valid(struct drm_device *, u32 tile_flags); | 63 | bool nvc0_vram_flags_valid(struct drm_device *, u32 tile_flags); |
64 | 64 | ||
65 | #endif | 65 | #endif |