summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-01-14 14:52:58 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-01-22 12:17:52 +1000
commit639c308effb945732feb26fe416a6f00f3147ae4 (patch)
treea2d2b5fd441c7a526d754df11915232f9739f875 /drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h
parenta8c4362bad2218484870678f5d0c221968883f13 (diff)
drm/nouveau/fb: namespace + nvidia gpu names (no binary change)
The namespace of NVKM is being changed to nvkm_ instead of nouveau_, which will be used for the DRM part of the driver. This is being done in order to make it very clear as to what part of the driver a given symbol belongs to, and as a minor step towards splitting the DRM driver out to be able to stand on its own (for virt). Because there's already a large amount of churn here anyway, this is as good a time as any to also switch to NVIDIA's device and chipset naming to ease collaboration with them. A comparison of objdump disassemblies proves no code changes. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h
index 581f808527f2..602182661820 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h
@@ -1,17 +1,14 @@
#ifndef __NVKM_FB_NV40_H__
#define __NVKM_FB_NV40_H__
-
#include "priv.h"
struct nv40_ram {
- struct nouveau_ram base;
+ struct nvkm_ram base;
u32 ctrl;
u32 coef;
};
-
-int nv40_ram_calc(struct nouveau_fb *, u32);
-int nv40_ram_prog(struct nouveau_fb *);
-void nv40_ram_tidy(struct nouveau_fb *);
-
+int nv40_ram_calc(struct nvkm_fb *, u32);
+int nv40_ram_prog(struct nvkm_fb *);
+void nv40_ram_tidy(struct nvkm_fb *);
#endif