diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 15:09:19 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-19 15:42:01 +1000 |
| commit | 5dbf81e9b6af3ce40c222748259e4f42bb15dacc (patch) | |
| tree | 61e725d3fbb1bb1829a73de8efc41fc9d00b54ff /drm/nouveau/nvkm/subdev/fb | |
| parent | 3f13efb6c376e5d5ced60b0a819d03d0e1317ddf (diff) | |
| download | nouveau-5dbf81e9b6af3ce40c222748259e4f42bb15dacc.tar.gz | |
mmu: 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 'drm/nouveau/nvkm/subdev/fb')
| -rw-r--r-- | drm/nouveau/nvkm/subdev/fb/gf100.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/fb/nv30.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/fb/nv50.c | 1 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/fb/ramgk20a.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/fb/ramnv1a.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/fb/ramnv50.c | 1 |
6 files changed, 10 insertions, 0 deletions
diff --git a/drm/nouveau/nvkm/subdev/fb/gf100.c b/drm/nouveau/nvkm/subdev/fb/gf100.c index 5a6c2b7a6..d51aa0237 100644 --- a/drm/nouveau/nvkm/subdev/fb/gf100.c +++ b/drm/nouveau/nvkm/subdev/fb/gf100.c @@ -23,6 +23,8 @@ */ #include "gf100.h" +#include <core/device.h> + extern const u8 gf100_pte_storage_type_map[256]; bool diff --git a/drm/nouveau/nvkm/subdev/fb/nv30.c b/drm/nouveau/nvkm/subdev/fb/nv30.c index 6c0b82f35..09ebb9477 100644 --- a/drm/nouveau/nvkm/subdev/fb/nv30.c +++ b/drm/nouveau/nvkm/subdev/fb/nv30.c @@ -25,6 +25,8 @@ */ #include "nv04.h" +#include <core/device.h> + void nv30_fb_tile_init(struct nvkm_fb *pfb, int i, u32 addr, u32 size, u32 pitch, u32 flags, struct nvkm_fb_tile *tile) diff --git a/drm/nouveau/nvkm/subdev/fb/nv50.c b/drm/nouveau/nvkm/subdev/fb/nv50.c index 48fd5a5bc..0480ce52a 100644 --- a/drm/nouveau/nvkm/subdev/fb/nv50.c +++ b/drm/nouveau/nvkm/subdev/fb/nv50.c @@ -24,6 +24,7 @@ #include "nv50.h" #include <core/client.h> +#include <core/device.h> #include <core/engctx.h> #include <core/enum.h> diff --git a/drm/nouveau/nvkm/subdev/fb/ramgk20a.c b/drm/nouveau/nvkm/subdev/fb/ramgk20a.c index 6cf526b4a..5f30db140 100644 --- a/drm/nouveau/nvkm/subdev/fb/ramgk20a.c +++ b/drm/nouveau/nvkm/subdev/fb/ramgk20a.c @@ -21,6 +21,8 @@ */ #include "priv.h" +#include <core/device.h> + struct gk20a_mem { struct nvkm_mem base; void *cpuaddr; diff --git a/drm/nouveau/nvkm/subdev/fb/ramnv1a.c b/drm/nouveau/nvkm/subdev/fb/ramnv1a.c index 8bb7e432a..fbae05db4 100644 --- a/drm/nouveau/nvkm/subdev/fb/ramnv1a.c +++ b/drm/nouveau/nvkm/subdev/fb/ramnv1a.c @@ -23,6 +23,8 @@ */ #include "priv.h" +#include <core/device.h> + static int nv1a_ram_create(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, diff --git a/drm/nouveau/nvkm/subdev/fb/ramnv50.c b/drm/nouveau/nvkm/subdev/fb/ramnv50.c index 14f5ba5ee..d2c81dd63 100644 --- a/drm/nouveau/nvkm/subdev/fb/ramnv50.c +++ b/drm/nouveau/nvkm/subdev/fb/ramnv50.c @@ -24,6 +24,7 @@ #include "nv50.h" #include "ramseq.h" +#include <core/device.h> #include <core/option.h> #include <subdev/bios.h> #include <subdev/bios/perf.h> |