diff options
| author | Ben Skeggs | 2015-01-14 05:40:03 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2015-01-22 03:17:50 +0100 |
| commit | d390b48027f886c9b8c60a4578044958f517047d (patch) | |
| tree | 1cd8c27b3c8a288b0183a4a3ea869d51b90e3774 /drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h | |
| parent | drm/nouveau/bar: namespace + nvidia gpu names (no binary change) (diff) | |
| download | kernel-qcow2-linux-d390b48027f886c9b8c60a4578044958f517047d.tar.gz kernel-qcow2-linux-d390b48027f886c9b8c60a4578044958f517047d.tar.xz kernel-qcow2-linux-d390b48027f886c9b8c60a4578044958f517047d.zip | |
drm/nouveau/bios: 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/include/nvkm/subdev/bios/vmap.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h index ad5a8f20e113..6633c6db9281 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h @@ -1,13 +1,10 @@ #ifndef __NVBIOS_VMAP_H__ #define __NVBIOS_VMAP_H__ - -struct nouveau_bios; - struct nvbios_vmap { }; -u16 nvbios_vmap_table(struct nouveau_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len); -u16 nvbios_vmap_parse(struct nouveau_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len, +u16 nvbios_vmap_table(struct nvkm_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len); +u16 nvbios_vmap_parse(struct nvkm_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_vmap *); struct nvbios_vmap_entry { @@ -18,8 +15,7 @@ struct nvbios_vmap_entry { s32 arg[6]; }; -u16 nvbios_vmap_entry(struct nouveau_bios *, int idx, u8 *ver, u8 *len); -u16 nvbios_vmap_entry_parse(struct nouveau_bios *, int idx, u8 *ver, u8 *len, +u16 nvbios_vmap_entry(struct nvkm_bios *, int idx, u8 *ver, u8 *len); +u16 nvbios_vmap_entry_parse(struct nvkm_bios *, int idx, u8 *ver, u8 *len, struct nvbios_vmap_entry *); - #endif |