From 989aa5b76ad2af7653353cf01bdebec2ba9436aa Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 12 Jan 2015 12:33:37 +1000 Subject: drm/nouveau/nvif: namespace of nvkm accessors (no binary change) NVKM is having it's namespace switched to nvkm_, which will conflict with these functions (which are workarounds for the fact that as of yet, we still aren't able to split DRM and NVKM completely). A comparison of objdump disassemblies proves no code changes. Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/include/nvif/client.h | 2 +- drivers/gpu/drm/nouveau/include/nvif/device.h | 31 +++++++++++++-------------- drivers/gpu/drm/nouveau/include/nvif/object.h | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) (limited to 'drivers/gpu/drm/nouveau/include') diff --git a/drivers/gpu/drm/nouveau/include/nvif/client.h b/drivers/gpu/drm/nouveau/include/nvif/client.h index 8b0048426ee5..97694738abcf 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/client.h +++ b/drivers/gpu/drm/nouveau/include/nvif/client.h @@ -31,7 +31,7 @@ int nvif_client_resume(struct nvif_client *); /*XXX*/ #include -#define nvkm_client(a) ({ \ +#define nvxx_client(a) ({ \ struct nvif_client *_client = nvif_client(nvif_object(a)); \ nouveau_client(_client->base.priv); \ }) diff --git a/drivers/gpu/drm/nouveau/include/nvif/device.h b/drivers/gpu/drm/nouveau/include/nvif/device.h index 90e2d9706f23..1d186e21d123 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/device.h +++ b/drivers/gpu/drm/nouveau/include/nvif/device.h @@ -37,26 +37,25 @@ void nvif_device_ref(struct nvif_device *, struct nvif_device **); #include #include -#define nvkm_device(a) nv_device(nvkm_object((a))) -#define nvkm_bios(a) nouveau_bios(nvkm_device(a)) -#define nvkm_fb(a) nouveau_fb(nvkm_device(a)) -#define nvkm_mmu(a) nouveau_mmu(nvkm_device(a)) -#define nvkm_bar(a) nouveau_bar(nvkm_device(a)) -#define nvkm_gpio(a) nouveau_gpio(nvkm_device(a)) -#define nvkm_clk(a) nouveau_clk(nvkm_device(a)) -#define nvkm_i2c(a) nouveau_i2c(nvkm_device(a)) -#define nvkm_timer(a) nouveau_timer(nvkm_device(a)) -#define nvkm_wait(a,b,c,d) nv_wait(nvkm_timer(a), (b), (c), (d)) -#define nvkm_wait_cb(a,b,c) nv_wait_cb(nvkm_timer(a), (b), (c)) -#define nvkm_therm(a) nouveau_therm(nvkm_device(a)) +#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_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)) #include #include #include #include -#define nvkm_fifo(a) nouveau_fifo(nvkm_device(a)) -#define nvkm_fifo_chan(a) ((struct nouveau_fifo_chan *)nvkm_object(a)) -#define nvkm_gr(a) ((struct nouveau_gr *)nouveau_engine(nvkm_object(a), NVDEV_ENGINE_GR)) - +#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)) #endif diff --git a/drivers/gpu/drm/nouveau/include/nvif/object.h b/drivers/gpu/drm/nouveau/include/nvif/object.h index fe519179b76c..d47f5693cb5b 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 -#define nvkm_object(a) ((struct nouveau_object *)nvif_object(a)->priv) +#define nvxx_object(a) ((struct nouveau_object *)nvif_object(a)->priv) #endif -- cgit v1.2.3