diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 15:36:34 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-19 15:42:03 +1000 |
| commit | 7c92bfba4d743710dedb4b4c412ce0e62482cd72 (patch) | |
| tree | 7f796da0446be3afdc85c5e159079fc63a56aa8f /bin | |
| parent | f614350d44564f52b5e13ddfc5ab114cf35cfe4c (diff) | |
| download | nouveau-7c92bfba4d743710dedb4b4c412ce0e62482cd72.tar.gz | |
drm: finalise nvkm namespace switch (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 'bin')
| -rw-r--r-- | bin/nv_aux.c | 6 | ||||
| -rw-r--r-- | bin/nv_i2c.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/nv_aux.c b/bin/nv_aux.c index 3bc11e5ff..f8b7c8022 100644 --- a/bin/nv_aux.c +++ b/bin/nv_aux.c @@ -7,7 +7,7 @@ #include <nvif/class.h> static void -print_chan(struct nouveau_i2c_port *chan) +print_chan(struct nvkm_i2c_port *chan) { printf("chan 0x%02x: type %04x\n", chan->index, nv_mclass(chan)); } @@ -21,8 +21,8 @@ main(int argc, char **argv) u64 dev = ~0ULL; struct nvif_client *client; struct nvif_device *device; - struct nouveau_i2c_port *chan; - struct nouveau_i2c *i2c; + struct nvkm_i2c_port *chan; + struct nvkm_i2c *i2c; int action = -1, index = -1; int addr = -1, val = -1; int ret, c; diff --git a/bin/nv_i2c.c b/bin/nv_i2c.c index e7fa4cd10..ee469f0a0 100644 --- a/bin/nv_i2c.c +++ b/bin/nv_i2c.c @@ -7,7 +7,7 @@ #include <nvif/class.h> static void -print_port(struct nouveau_i2c_port *port) +print_port(struct nvkm_i2c_port *port) { printf("port 0x%02x: type %04x\n", port->index, nv_mclass(port)); } @@ -21,8 +21,8 @@ main(int argc, char **argv) u64 dev = ~0ULL; struct nvif_client *client; struct nvif_device *device; - struct nouveau_i2c_port *port; - struct nouveau_i2c *i2c; + struct nvkm_i2c_port *port; + struct nvkm_i2c *i2c; int addr = -1, reg = -1, val = -1; int action = -1, index = -1; int ret, c; |