diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 05:36:34 (GMT) |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 02:18:07 (GMT) |
commit | be83cd4ef9a2a56bd35550bf96146b7b837daf02 (patch) | |
tree | 7cd92cdbb6c9fa473f4b896e8bd22e9dc8cbc28e /drivers/gpu/drm/nouveau/include/nvif | |
parent | 9719047b4d985ca7a46819956047cca04213d63e (diff) | |
download | linux-be83cd4ef9a2a56bd35550bf96146b7b837daf02.tar.xz |
drm/nouveau: 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 'drivers/gpu/drm/nouveau/include/nvif')
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/client.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/device.h | 24 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/object.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/client.h b/drivers/gpu/drm/nouveau/include/nvif/client.h index 9769473..eca648e 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/client.h +++ b/drivers/gpu/drm/nouveau/include/nvif/client.h @@ -33,7 +33,7 @@ int nvif_client_resume(struct nvif_client *); #include <core/client.h> #define nvxx_client(a) ({ \ struct nvif_client *_client = nvif_client(nvif_object(a)); \ - nouveau_client(_client->base.priv); \ + nvkm_client(_client->base.priv); \ }) #endif diff --git a/drivers/gpu/drm/nouveau/include/nvif/device.h b/drivers/gpu/drm/nouveau/include/nvif/device.h index 1fafcac..88553a7 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/device.h +++ b/drivers/gpu/drm/nouveau/include/nvif/device.h @@ -38,24 +38,24 @@ void nvif_device_ref(struct nvif_device *, struct nvif_device **); #include <subdev/therm.h> #define nvxx_device(a) nv_device(nvxx_object((a))) -#define nvxx_bios(a) nouveau_bios(nvxx_device(a)) -#define nvxx_fb(a) nouveau_fb(nvxx_device(a)) -#define nvxx_mmu(a) nouveau_mmu(nvxx_device(a)) -#define nvxx_bar(a) nouveau_bar(nvxx_device(a)) -#define nvxx_gpio(a) nouveau_gpio(nvxx_device(a)) -#define nvxx_clk(a) nouveau_clk(nvxx_device(a)) -#define nvxx_i2c(a) nouveau_i2c(nvxx_device(a)) -#define nvxx_timer(a) nouveau_timer(nvxx_device(a)) +#define nvxx_bios(a) nvkm_bios(nvxx_device(a)) +#define nvxx_fb(a) nvkm_fb(nvxx_device(a)) +#define nvxx_mmu(a) nvkm_mmu(nvxx_device(a)) +#define nvxx_bar(a) nvkm_bar(nvxx_device(a)) +#define nvxx_gpio(a) nvkm_gpio(nvxx_device(a)) +#define nvxx_clk(a) nvkm_clk(nvxx_device(a)) +#define nvxx_i2c(a) nvkm_i2c(nvxx_device(a)) +#define nvxx_timer(a) nvkm_timer(nvxx_device(a)) #define nvxx_wait(a,b,c,d) nv_wait(nvxx_timer(a), (b), (c), (d)) #define nvxx_wait_cb(a,b,c) nv_wait_cb(nvxx_timer(a), (b), (c)) -#define nvxx_therm(a) nouveau_therm(nvxx_device(a)) +#define nvxx_therm(a) nvkm_therm(nvxx_device(a)) #include <core/device.h> #include <engine/fifo.h> #include <engine/gr.h> #include <engine/sw.h> -#define nvxx_fifo(a) nouveau_fifo(nvxx_device(a)) -#define nvxx_fifo_chan(a) ((struct nouveau_fifo_chan *)nvxx_object(a)) -#define nvxx_gr(a) ((struct nouveau_gr *)nouveau_engine(nvxx_object(a), NVDEV_ENGINE_GR)) +#define nvxx_fifo(a) nvkm_fifo(nvxx_device(a)) +#define nvxx_fifo_chan(a) ((struct nvkm_fifo_chan *)nvxx_object(a)) +#define nvxx_gr(a) ((struct nvkm_gr *)nvkm_engine(nvxx_object(a), NVDEV_ENGINE_GR)) #endif diff --git a/drivers/gpu/drm/nouveau/include/nvif/object.h b/drivers/gpu/drm/nouveau/include/nvif/object.h index d47f569..04c8747 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/object.h +++ b/drivers/gpu/drm/nouveau/include/nvif/object.h @@ -70,6 +70,6 @@ void nvif_object_unmap(struct nvif_object *); /*XXX*/ #include <core/object.h> -#define nvxx_object(a) ((struct nouveau_object *)nvif_object(a)->priv) +#define nvxx_object(a) ((struct nvkm_object *)nvif_object(a)->priv) #endif |