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 <bskeggs@redhat.com>

28 files changed, 124 insertions, 125 deletions

diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index f8ddae26dfbf..f32eecbe3c95 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -112,8 +112,8 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod
 {
         struct drm_device *dev = crtc->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_bios *bios = nvkm_bios(&drm->device);
-        struct nouveau_clk *clk = nvkm_clk(&drm->device);
+        struct nouveau_bios *bios = nvxx_bios(&drm->device);
+        struct nouveau_clk *clk = nvxx_clk(&drm->device);
         struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
         struct nv04_mode_state *state = &nv04_display(dev)->mode_reg;
         struct nv04_crtc_reg *regp = &state->crtc_reg[nv_crtc->index];
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index 2d8056cde996..043e07b01fd0 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -66,7 +66,7 @@ int nv04_dac_output_offset(struct drm_encoder *encoder)
 static int sample_load_twice(struct drm_device *dev, bool sense[2])
 {
         struct nvif_device *device = &nouveau_drm(dev)->device;
-        struct nouveau_timer *ptimer = nvkm_timer(device);
+        struct nouveau_timer *ptimer = nvxx_timer(device);
         int i;
 
         for (i = 0; i < 2; i++) {
@@ -232,7 +232,7 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)
         struct drm_device *dev = encoder->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nvif_device *device = &nouveau_drm(dev)->device;
-        struct nouveau_gpio *gpio = nvkm_gpio(device);
+        struct nouveau_gpio *gpio = nvxx_gpio(device);
         struct dcb_output *dcb = nouveau_encoder(encoder)->dcb;
         uint32_t sample, testval, regoffset = nv04_dac_output_offset(encoder);
         uint32_t saved_powerctrl_2 = 0, saved_powerctrl_4 = 0, saved_routput,
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
index 42a5435259f7..a326f374e37c 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -623,7 +623,7 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder)
         struct drm_device *dev = encoder->dev;
         struct dcb_output *dcb = nouveau_encoder(encoder)->dcb;
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_i2c *i2c = nvkm_i2c(&drm->device);
+        struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);
         struct nouveau_i2c_port *port = i2c->find(i2c, 2);
         struct nouveau_i2c_board_info info[] = {
                 {
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index bdf7cf49afcd..3373a15eab5d 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -35,7 +35,7 @@ int
 nv04_display_create(struct drm_device *dev)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_i2c *i2c = nvkm_i2c(&drm->device);
+        struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);
         struct dcb_table *dcb = &drm->vbios.dcb;
         struct drm_connector *connector, *ct;
         struct drm_encoder *encoder;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.h b/drivers/gpu/drm/nouveau/dispnv04/disp.h
index 3ad3ee818c1a..fe4901cfae27 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.h
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.h
@@ -170,7 +170,7 @@ nouveau_bios_run_init_table(struct drm_device *dev, u16 table,
                             struct dcb_output *outp, int crtc)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_bios *bios = nvkm_bios(&drm->device);
+        struct nouveau_bios *bios = nvxx_bios(&drm->device);
         struct nvbios_init init = {
                 .subdev = nv_subdev(bios),
                 .bios = bios,
diff --git a/drivers/gpu/drm/nouveau/dispnv04/hw.c b/drivers/gpu/drm/nouveau/dispnv04/hw.c
index f9491f926c14..a930c1e71148 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/hw.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/hw.c
@@ -166,7 +166,7 @@ nouveau_hw_get_pllvals(struct drm_device *dev, enum nvbios_pll_type plltype,
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nvif_device *device = &drm->device;
-        struct nouveau_bios *bios = nvkm_bios(device);
+        struct nouveau_bios *bios = nvxx_bios(device);
         uint32_t reg1, pll1, pll2 = 0;
         struct nvbios_pll pll_lim;
         int ret;
@@ -253,8 +253,8 @@ nouveau_hw_fix_bad_vpll(struct drm_device *dev, int head)
 
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nvif_device *device = &drm->device;
-        struct nouveau_clk *clk = nvkm_clk(device);
-        struct nouveau_bios *bios = nvkm_bios(device);
+        struct nouveau_clk *clk = nvxx_clk(device);
+        struct nouveau_bios *bios = nvxx_bios(device);
         struct nvbios_pll pll_lim;
         struct nouveau_pll_vals pv;
         enum nvbios_pll_type pll = head ? PLL_VPLL1 : PLL_VPLL0;
@@ -463,7 +463,7 @@ nv_load_state_ramdac(struct drm_device *dev, int head,
                      struct nv04_mode_state *state)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_clk *clk = nvkm_clk(&drm->device);
+        struct nouveau_clk *clk = nvxx_clk(&drm->device);
         struct nv04_crtc_reg *regp = &state->crtc_reg[head];
         uint32_t pllreg = head ? NV_RAMDAC_VPLL2 : NV_PRAMDAC_VPLL_COEFF;
         int i;
@@ -661,7 +661,7 @@ nv_load_state_ext(struct drm_device *dev, int head,
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nvif_device *device = &drm->device;
-        struct nouveau_timer *ptimer = nvkm_timer(device);
+        struct nouveau_timer *ptimer = nvxx_timer(device);
         struct nv04_crtc_reg *regp = &state->crtc_reg[head];
         uint32_t reg900;
         int i;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
index 8061d8d0ce79..38a8196d1e92 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -54,7 +54,7 @@ static struct nouveau_i2c_board_info nv04_tv_encoder_info[] = {
 int nv04_tv_identify(struct drm_device *dev, int i2c_index)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_i2c *i2c = nvkm_i2c(&drm->device);
+        struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);
 
         return i2c->identify(i2c, i2c_index, "TV encoder",
                              nv04_tv_encoder_info, NULL, NULL);
@@ -204,7 +204,7 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry)
         struct drm_encoder *encoder;
         struct drm_device *dev = connector->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_i2c *i2c = nvkm_i2c(&drm->device);
+        struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);
         struct nouveau_i2c_port *port = i2c->find(i2c, entry->i2c_index);
         int type, ret;
 
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index 72d2ab04db47..b86e36b4077d 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -46,7 +46,7 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)
 {
         struct drm_device *dev = encoder->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_gpio *gpio = nvkm_gpio(&drm->device);
+        struct nouveau_gpio *gpio = nvxx_gpio(&drm->device);
         uint32_t testval, regoffset = nv04_dac_output_offset(encoder);
         uint32_t gpio0, gpio1, fp_htotal, fp_hsync_start, fp_hsync_end,
                 fp_control, test_ctrl, dacclk, ctv_14, ctv_1c, ctv_6c;
@@ -133,14 +133,14 @@ get_tv_detect_quirks(struct drm_device *dev, uint32_t *pin_mask)
         struct nvif_device *device = &drm->device;
 
         /* Zotac FX5200 */
-        if (nv_device_match(nvkm_object(device), 0x0322, 0x19da, 0x1035) ||
-            nv_device_match(nvkm_object(device), 0x0322, 0x19da, 0x2035)) {
+        if (nv_device_match(nvxx_object(device), 0x0322, 0x19da, 0x1035) ||
+            nv_device_match(nvxx_object(device), 0x0322, 0x19da, 0x2035)) {
                 *pin_mask = 0xc;
                 return false;
         }
 
         /* MSI nForce2 IGP */
-        if (nv_device_match(nvkm_object(device), 0x01f0, 0x1462, 0x5710)) {
+        if (nv_device_match(nvxx_object(device), 0x01f0, 0x1462, 0x5710)) {
                 *pin_mask = 0xc;
                 return false;
         }
@@ -370,7 +370,7 @@ static void  nv17_tv_dpms(struct drm_encoder *encoder, int mode)
 {
         struct drm_device *dev = encoder->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_gpio *gpio = nvkm_gpio(&drm->device);
+        struct nouveau_gpio *gpio = nvxx_gpio(&drm->device);
         struct nv17_tv_state *regs = &to_tv_enc(encoder)->state;
         struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);
 
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 <core/client.h>
-#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 <subdev/timer.h>
 #include <subdev/therm.h>
 
-#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 <engine/device.h>
 #include <engine/fifo.h>
 #include <engine/gr.h>
 #include <engine/sw.h>
 
-#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 <core/object.h>
-#define nvkm_object(a) ((struct nouveau_object *)nvif_object(a)->priv)
+#define nvxx_object(a) ((struct nouveau_object *)nvif_object(a)->priv)
 
 #endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 16ab6b187a52..9322b515d305 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -164,8 +164,8 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
         struct nouveau_cli *cli = nouveau_cli(file_priv);
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nvif_device *device = &drm->device;
-        struct nouveau_timer *ptimer = nvkm_timer(device);
-        struct nouveau_gr *gr = nvkm_gr(device);
+        struct nouveau_timer *ptimer = nvxx_timer(device);
+        struct nouveau_gr *gr = nvxx_gr(device);
         struct drm_nouveau_getparam *getparam = data;
 
         switch (getparam->param) {
@@ -173,19 +173,19 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
                 getparam->value = device->info.chipset;
                 break;
         case NOUVEAU_GETPARAM_PCI_VENDOR:
-                if (nv_device_is_pci(nvkm_device(device)))
+                if (nv_device_is_pci(nvxx_device(device)))
                         getparam->value = dev->pdev->vendor;
                 else
                         getparam->value = 0;
                 break;
         case NOUVEAU_GETPARAM_PCI_DEVICE:
-                if (nv_device_is_pci(nvkm_device(device)))
+                if (nv_device_is_pci(nvxx_device(device)))
                         getparam->value = dev->pdev->device;
                 else
                         getparam->value = 0;
                 break;
         case NOUVEAU_GETPARAM_BUS_TYPE:
-                if (!nv_device_is_pci(nvkm_device(device)))
+                if (!nv_device_is_pci(nvxx_device(device)))
                         getparam->value = 3;
                 else
                 if (drm_pci_device_is_agp(dev))
diff --git a/drivers/gpu/drm/nouveau/nouveau_agp.c b/drivers/gpu/drm/nouveau/nouveau_agp.c
index 1f6f6ba6847a..0b5970955604 100644
--- a/drivers/gpu/drm/nouveau/nouveau_agp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_agp.c
@@ -45,8 +45,8 @@ get_agp_mode(struct nouveau_drm *drm, const struct drm_agp_info *info)
         while (agpmode == -1 && quirk->hostbridge_vendor) {
                 if (info->id_vendor == quirk->hostbridge_vendor &&
                     info->id_device == quirk->hostbridge_device &&
-                    nvkm_device(device)->pdev->vendor == quirk->chip_vendor &&
-                    nvkm_device(device)->pdev->device == quirk->chip_device) {
+                    nvxx_device(device)->pdev->vendor == quirk->chip_vendor &&
+                    nvxx_device(device)->pdev->device == quirk->chip_device) {
                         agpmode = quirk->mode;
                         NV_INFO(drm, "Forcing agp mode to %dX. Use agpmode to override.\n",
                                 agpmode);
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 7df6acc8bb34..8058b68b0e3b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -2009,7 +2009,7 @@ uint8_t *nouveau_bios_embedded_edid(struct drm_device *dev)
 static bool NVInitVBIOS(struct drm_device *dev)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_bios *bios = nvkm_bios(&drm->device);
+        struct nouveau_bios *bios = nvxx_bios(&drm->device);
         struct nvbios *legacy = &drm->vbios;
 
         memset(legacy, 0, sizeof(struct nvbios));
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index d2f0929c2d73..902d93fd72cc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -48,7 +48,7 @@ nv10_bo_update_tile_region(struct drm_device *dev, struct nouveau_drm_tile *reg,
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
         int i = reg - drm->tile.reg;
-        struct nouveau_fb *pfb = nvkm_fb(&drm->device);
+        struct nouveau_fb *pfb = nvxx_fb(&drm->device);
         struct nouveau_fb_tile *tile = &pfb->tile.region[i];
         struct nouveau_engine *engine;
 
@@ -105,7 +105,7 @@ nv10_bo_set_tiling(struct drm_device *dev, u32 addr,
                    u32 size, u32 pitch, u32 flags)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_fb *pfb = nvkm_fb(&drm->device);
+        struct nouveau_fb *pfb = nvxx_fb(&drm->device);
         struct nouveau_drm_tile *tile, *found = NULL;
         int i;
 
@@ -214,7 +214,7 @@ nouveau_bo_new(struct drm_device *dev, int size, int align,
         nvbo->tile_flags = tile_flags;
         nvbo->bo.bdev = &drm->ttm.bdev;
 
-        if (!nv_device_is_cpu_coherent(nvkm_device(&drm->device)))
+        if (!nv_device_is_cpu_coherent(nvxx_device(&drm->device)))
                 nvbo->force_coherent = flags & TTM_PL_FLAG_UNCACHED;
 
         nvbo->page_shift = 12;
@@ -459,7 +459,7 @@ void
 nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)
 {
         struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);
-        struct nouveau_device *device = nvkm_device(&drm->device);
+        struct nouveau_device *device = nvxx_device(&drm->device);
         struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
         int i;
 
@@ -479,7 +479,7 @@ void
 nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)
 {
         struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);
-        struct nouveau_device *device = nvkm_device(&drm->device);
+        struct nouveau_device *device = nvxx_device(&drm->device);
         struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
         int i;
 
@@ -620,7 +620,7 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
 
                 if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
                         /* Some BARs do not support being ioremapped WC */
-                        if (nvkm_bar(&drm->device)->iomap_uncached) {
+                        if (nvxx_bar(&drm->device)->iomap_uncached) {
                                 man->available_caching = TTM_PL_FLAG_UNCACHED;
                                 man->default_caching = TTM_PL_FLAG_UNCACHED;
                         }
@@ -1382,10 +1382,10 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
                 /* fallthrough, tiled memory */
         case TTM_PL_VRAM:
                 mem->bus.offset = mem->start << PAGE_SHIFT;
-                mem->bus.base = nv_device_resource_start(nvkm_device(&drm->device), 1);
+                mem->bus.base = nv_device_resource_start(nvxx_device(&drm->device), 1);
                 mem->bus.is_iomem = true;
                 if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
-                        struct nouveau_bar *bar = nvkm_bar(&drm->device);
+                        struct nouveau_bar *bar = nvxx_bar(&drm->device);
 
                         ret = bar->umap(bar, node, NV_MEM_ACCESS_RW,
                                         &node->bar_vma);
@@ -1405,7 +1405,7 @@ static void
 nouveau_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
 {
         struct nouveau_drm *drm = nouveau_bdev(bdev);
-        struct nouveau_bar *bar = nvkm_bar(&drm->device);
+        struct nouveau_bar *bar = nvxx_bar(&drm->device);
         struct nouveau_mem *node = mem->mm_node;
 
         if (!node->bar_vma.node)
@@ -1420,7 +1420,7 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo)
         struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
         struct nouveau_bo *nvbo = nouveau_bo(bo);
         struct nvif_device *device = &drm->device;
-        u32 mappable = nv_device_resource_len(nvkm_device(device), 1) >> PAGE_SHIFT;
+        u32 mappable = nv_device_resource_len(nvxx_device(device), 1) >> PAGE_SHIFT;
         int i, ret;
 
         /* as long as the bo isn't in vram, and isn't tiled, we've got
@@ -1484,7 +1484,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm)
         }
 
         drm = nouveau_bdev(ttm->bdev);
-        device = nvkm_device(&drm->device);
+        device = nvxx_device(&drm->device);
         dev = drm->dev;
         pdev = nv_device_base(device);
 
@@ -1549,7 +1549,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)
                 return;
 
         drm = nouveau_bdev(ttm->bdev);
-        device = nvkm_device(&drm->device);
+        device = nvxx_device(&drm->device);
         dev = drm->dev;
         pdev = nv_device_base(device);
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 58b8b6423026..3bcbbd329cf2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -54,7 +54,7 @@ nouveau_channel_idle(struct nouveau_channel *chan)
 
         if (ret)
                 NV_PRINTK(error, cli, "failed to idle channel 0x%08x [%s]\n",
-                          chan->object->handle, nvkm_client(&cli->base)->name);
+                          chan->object->handle, nvxx_client(&cli->base)->name);
         return ret;
 }
 
@@ -88,7 +88,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
                      u32 handle, u32 size, struct nouveau_channel **pchan)
 {
         struct nouveau_cli *cli = (void *)nvif_client(&device->base);
-        struct nouveau_mmu *mmu = nvkm_mmu(device);
+        struct nouveau_mmu *mmu = nvxx_mmu(device);
         struct nv_dma_v0 args = {};
         struct nouveau_channel *chan;
         u32 target;
@@ -146,7 +146,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
                          */
                         args.target = NV_DMA_V0_TARGET_PCI;
                         args.access = NV_DMA_V0_ACCESS_RDWR;
-                        args.start = nv_device_resource_start(nvkm_device(device), 1);
+                        args.start = nv_device_resource_start(nvxx_device(device), 1);
                         args.limit = args.start + device->info.ram_user - 1;
                 } else {
                         args.target = NV_DMA_V0_TARGET_VRAM;
@@ -281,7 +281,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
 {
         struct nvif_device *device = chan->device;
         struct nouveau_cli *cli = (void *)nvif_client(&device->base);
-        struct nouveau_mmu *mmu = nvkm_mmu(device);
+        struct nouveau_mmu *mmu = nvxx_mmu(device);
         struct nouveau_sw_chan *swch;
         struct nv_dma_v0 args = {};
         int ret, i;
@@ -372,7 +372,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
                 if (ret)
                         return ret;
 
-                swch = (void *)nvkm_object(&chan->nvsw)->parent;
+                swch = (void *)nvxx_object(&chan->nvsw)->parent;
                 swch->flip = nouveau_flip_complete;
                 swch->flip_data = chan;
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 9c871f93cc1e..4ab6340b0dac 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -115,7 +115,7 @@ nouveau_connector_ddc_detect(struct drm_connector *connector)
         struct drm_device *dev = connector->dev;
         struct nouveau_connector *nv_connector = nouveau_connector(connector);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_gpio *gpio = nvkm_gpio(&drm->device);
+        struct nouveau_gpio *gpio = nvxx_gpio(&drm->device);
         struct nouveau_encoder *nv_encoder;
         struct drm_encoder *encoder;
         int i, panel = -ENODEV;
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index f972e9c1a23a..860b0e2d4181 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -450,7 +450,7 @@ nouveau_display_create(struct drm_device *dev)
         drm_mode_create_dvi_i_properties(dev);
 
         dev->mode_config.funcs = &nouveau_mode_config_funcs;
-        dev->mode_config.fb_base = nv_device_resource_start(nvkm_device(&drm->device), 1);
+        dev->mode_config.fb_base = nv_device_resource_start(nvxx_device(&drm->device), 1);
 
         dev->mode_config.min_width = 0;
         dev->mode_config.min_height = 0;
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index e684040ccf11..1de82ec6c276 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -124,7 +124,7 @@ nouveau_cli_create(u64 name, const char *sname,
 static void
 nouveau_cli_destroy(struct nouveau_cli *cli)
 {
-        nouveau_vm_ref(NULL, &nvkm_client(&cli->base)->vm, NULL);
+        nouveau_vm_ref(NULL, &nvxx_client(&cli->base)->vm, NULL);
         nvif_client_fini(&cli->base);
         usif_client_fini(cli);
 }
@@ -243,7 +243,7 @@ nouveau_accel_init(struct nouveau_drm *drm)
                                 OUT_RING  (drm->channel, 0x001f0000);
                         }
                 }
-                swch = (void *)nvkm_object(&drm->nvsw)->parent;
+                swch = (void *)nvxx_object(&drm->nvsw)->parent;
                 swch->flip = nouveau_flip_complete;
                 swch->flip_data = drm->channel;
         }
@@ -255,7 +255,7 @@ nouveau_accel_init(struct nouveau_drm *drm)
         }
 
         if (device->info.family < NV_DEVICE_INFO_V0_FERMI) {
-                ret = nouveau_gpuobj_new(nvkm_object(&drm->device), NULL, 32,
+                ret = nouveau_gpuobj_new(nvxx_object(&drm->device), NULL, 32,
                                          0, 0, &drm->notify);
                 if (ret) {
                         NV_ERROR(drm, "failed to allocate notifier, %d\n", ret);
@@ -379,7 +379,7 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags)
 
         dev->dev_private = drm;
         drm->dev = dev;
-        nvkm_client(&drm->client.base)->debug =
+        nvxx_client(&drm->client.base)->debug =
                 nouveau_dbgopt(nouveau_debug, "DRM");
 
         INIT_LIST_HEAD(&drm->clients);
@@ -435,12 +435,12 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags)
         nouveau_agp_init(drm);
 
         if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
-                ret = nouveau_vm_new(nvkm_device(&drm->device), 0, (1ULL << 40),
+                ret = nouveau_vm_new(nvxx_device(&drm->device), 0, (1ULL << 40),
                                      0x1000, &drm->client.vm);
                 if (ret)
                         goto fail_device;
 
-                nvkm_client(&drm->client.base)->vm = drm->client.vm;
+                nvxx_client(&drm->client.base)->vm = drm->client.vm;
         }
 
         ret = nouveau_ttm_init(drm);
@@ -527,7 +527,7 @@ nouveau_drm_device_remove(struct drm_device *dev)
         struct nouveau_object *device;
 
         dev->irq_enabled = false;
-        client = nvkm_client(&drm->client.base);
+        client = nvxx_client(&drm->client.base);
         device = client->device;
         drm_put_dev(dev);
 
@@ -831,14 +831,14 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv)
         cli->base.super = false;
 
         if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
-                ret = nouveau_vm_new(nvkm_device(&drm->device), 0, (1ULL << 40),
+                ret = nouveau_vm_new(nvxx_device(&drm->device), 0, (1ULL << 40),
                                      0x1000, &cli->vm);
                 if (ret) {
                         nouveau_cli_destroy(cli);
                         goto out_suspend;
                 }
 
-                nvkm_client(&cli->base)->vm = cli->vm;
+                nvxx_client(&cli->base)->vm = cli->vm;
         }
 
         fpriv->driver_priv = cli;
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index f32a434724e3..c6d56bef5823 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -182,7 +182,7 @@ nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_cha
         else if (chan == chan->drm->channel)
                 strcpy(fctx->name, "generic kernel channel");
         else
-                strcpy(fctx->name, nvkm_client(&cli->base)->name);
+                strcpy(fctx->name, nvxx_client(&cli->base)->name);
 
         kref_init(&fctx->fence_ref);
         if (!priv->uevent)
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 9eb8af4daeeb..8453d1aac0e2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -251,7 +251,7 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nouveau_cli *cli = nouveau_cli(file_priv);
-        struct nouveau_fb *pfb = nvkm_fb(&drm->device);
+        struct nouveau_fb *pfb = nvxx_fb(&drm->device);
         struct drm_nouveau_gem_new *req = data;
         struct nouveau_bo *nvbo = NULL;
         int ret = 0;
diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
index afb36d66e78d..e63c15112f2e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
@@ -40,7 +40,7 @@ nouveau_hwmon_show_temp(struct device *d, struct device_attribute *a, char *buf)
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         int temp = therm->temp_get(therm);
 
         if (temp < 0)
@@ -66,7 +66,7 @@ nouveau_hwmon_temp1_auto_point1_temp(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
               therm->attr_get(therm, NOUVEAU_THERM_ATTR_THRS_FAN_BOOST) * 1000);
@@ -78,7 +78,7 @@ nouveau_hwmon_set_temp1_auto_point1_temp(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
 
         if (kstrtol(buf, 10, &value) == -EINVAL)
@@ -99,7 +99,7 @@ nouveau_hwmon_temp1_auto_point1_temp_hyst(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
          therm->attr_get(therm, NOUVEAU_THERM_ATTR_THRS_FAN_BOOST_HYST) * 1000);
@@ -111,7 +111,7 @@ nouveau_hwmon_set_temp1_auto_point1_temp_hyst(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
 
         if (kstrtol(buf, 10, &value) == -EINVAL)
@@ -131,7 +131,7 @@ nouveau_hwmon_max_temp(struct device *d, struct device_attribute *a, char *buf)
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
                therm->attr_get(therm, NOUVEAU_THERM_ATTR_THRS_DOWN_CLK) * 1000);
@@ -142,7 +142,7 @@ nouveau_hwmon_set_max_temp(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
 
         if (kstrtol(buf, 10, &value) == -EINVAL)
@@ -162,7 +162,7 @@ nouveau_hwmon_max_temp_hyst(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
           therm->attr_get(therm, NOUVEAU_THERM_ATTR_THRS_DOWN_CLK_HYST) * 1000);
@@ -173,7 +173,7 @@ nouveau_hwmon_set_max_temp_hyst(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
 
         if (kstrtol(buf, 10, &value) == -EINVAL)
@@ -194,7 +194,7 @@ nouveau_hwmon_critical_temp(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
                therm->attr_get(therm, NOUVEAU_THERM_ATTR_THRS_CRITICAL) * 1000);
@@ -206,7 +206,7 @@ nouveau_hwmon_set_critical_temp(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
 
         if (kstrtol(buf, 10, &value) == -EINVAL)
@@ -227,7 +227,7 @@ nouveau_hwmon_critical_temp_hyst(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
           therm->attr_get(therm, NOUVEAU_THERM_ATTR_THRS_CRITICAL_HYST) * 1000);
@@ -240,7 +240,7 @@ nouveau_hwmon_set_critical_temp_hyst(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
 
         if (kstrtol(buf, 10, &value) == -EINVAL)
@@ -260,7 +260,7 @@ nouveau_hwmon_emergency_temp(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
                therm->attr_get(therm, NOUVEAU_THERM_ATTR_THRS_SHUTDOWN) * 1000);
@@ -272,7 +272,7 @@ nouveau_hwmon_set_emergency_temp(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
 
         if (kstrtol(buf, 10, &value) == -EINVAL)
@@ -293,7 +293,7 @@ nouveau_hwmon_emergency_temp_hyst(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
           therm->attr_get(therm, NOUVEAU_THERM_ATTR_THRS_SHUTDOWN_HYST) * 1000);
@@ -306,7 +306,7 @@ nouveau_hwmon_set_emergency_temp_hyst(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
 
         if (kstrtol(buf, 10, &value) == -EINVAL)
@@ -346,7 +346,7 @@ nouveau_hwmon_show_fan1_input(struct device *d, struct device_attribute *attr,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
 
         return snprintf(buf, PAGE_SIZE, "%d\n", therm->fan_sense(therm));
 }
@@ -359,7 +359,7 @@ nouveau_hwmon_get_pwm1_enable(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         int ret;
 
         ret = therm->attr_get(therm, NOUVEAU_THERM_ATTR_FAN_MODE);
@@ -375,7 +375,7 @@ nouveau_hwmon_set_pwm1_enable(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
         int ret;
 
@@ -398,7 +398,7 @@ nouveau_hwmon_get_pwm1(struct device *d, struct device_attribute *a, char *buf)
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         int ret;
 
         ret = therm->fan_get(therm);
@@ -414,7 +414,7 @@ nouveau_hwmon_set_pwm1(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         int ret = -ENODEV;
         long value;
 
@@ -438,7 +438,7 @@ nouveau_hwmon_get_pwm1_min(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         int ret;
 
         ret = therm->attr_get(therm, NOUVEAU_THERM_ATTR_FAN_MIN_DUTY);
@@ -454,7 +454,7 @@ nouveau_hwmon_set_pwm1_min(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
         int ret;
 
@@ -478,7 +478,7 @@ nouveau_hwmon_get_pwm1_max(struct device *d,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         int ret;
 
         ret = therm->attr_get(therm, NOUVEAU_THERM_ATTR_FAN_MAX_DUTY);
@@ -494,7 +494,7 @@ nouveau_hwmon_set_pwm1_max(struct device *d, struct device_attribute *a,
 {
         struct drm_device *dev = dev_get_drvdata(d);
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         long value;
         int ret;
 
@@ -561,7 +561,7 @@ nouveau_hwmon_init(struct drm_device *dev)
 {
 #if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_therm *therm = nvkm_therm(&drm->device);
+        struct nouveau_therm *therm = nvxx_therm(&drm->device);
         struct nouveau_hwmon *hwmon;
         struct device *hwmon_dev;
         int ret = 0;
diff --git a/drivers/gpu/drm/nouveau/nouveau_platform.c b/drivers/gpu/drm/nouveau/nouveau_platform.c
index 34d78b288f97..5e6a2c90b8e2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_platform.c
+++ b/drivers/gpu/drm/nouveau/nouveau_platform.c
@@ -152,7 +152,7 @@ static int nouveau_platform_remove(struct platform_device *pdev)
 {
         struct drm_device *drm_dev = platform_get_drvdata(pdev);
         struct nouveau_drm *drm = nouveau_drm(drm_dev);
-        struct nouveau_device *device = nvkm_device(&drm->device);
+        struct nouveau_device *device = nvxx_device(&drm->device);
         struct nouveau_platform_gpu *gpu = nv_device_to_platform(device)->gpu;
 
         nouveau_drm_device_remove(drm_dev);
diff --git a/drivers/gpu/drm/nouveau/nouveau_sysfs.c b/drivers/gpu/drm/nouveau/nouveau_sysfs.c
index 8fbbf3093d86..1ec8f38ae69a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sysfs.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sysfs.c
@@ -165,7 +165,7 @@ nouveau_sysfs_fini(struct drm_device *dev)
         struct nvif_device *device = &drm->device;
 
         if (sysfs && sysfs->ctrl.priv) {
-                device_remove_file(nv_device_base(nvkm_device(device)), &dev_attr_pstate);
+                device_remove_file(nv_device_base(nvxx_device(device)), &dev_attr_pstate);
                 nvif_object_fini(&sysfs->ctrl);
         }
 
@@ -192,7 +192,7 @@ nouveau_sysfs_init(struct drm_device *dev)
                                NVIF_IOCTL_NEW_V0_CONTROL, NULL, 0,
                               &sysfs->ctrl);
         if (ret == 0)
-                device_create_file(nv_device_base(nvkm_device(device)), &dev_attr_pstate);
+                device_create_file(nv_device_base(nvxx_device(device)), &dev_attr_pstate);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index aa8321706103..7149f6d1fb43 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -33,7 +33,7 @@ static int
 nouveau_vram_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)
 {
         struct nouveau_drm *drm = nouveau_bdev(man->bdev);
-        struct nouveau_fb *pfb = nvkm_fb(&drm->device);
+        struct nouveau_fb *pfb = nvxx_fb(&drm->device);
         man->priv = pfb;
         return 0;
 }
@@ -64,7 +64,7 @@ nouveau_vram_manager_del(struct ttm_mem_type_manager *man,
                          struct ttm_mem_reg *mem)
 {
         struct nouveau_drm *drm = nouveau_bdev(man->bdev);
-        struct nouveau_fb *pfb = nvkm_fb(&drm->device);
+        struct nouveau_fb *pfb = nvxx_fb(&drm->device);
         nouveau_mem_node_cleanup(mem->mm_node);
         pfb->ram->put(pfb, (struct nouveau_mem **)&mem->mm_node);
 }
@@ -76,7 +76,7 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
                          struct ttm_mem_reg *mem)
 {
         struct nouveau_drm *drm = nouveau_bdev(man->bdev);
-        struct nouveau_fb *pfb = nvkm_fb(&drm->device);
+        struct nouveau_fb *pfb = nvxx_fb(&drm->device);
         struct nouveau_bo *nvbo = nouveau_bo(bo);
         struct nouveau_mem *node;
         u32 size_nc = 0;
@@ -208,7 +208,7 @@ static int
 nv04_gart_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)
 {
         struct nouveau_drm *drm = nouveau_bdev(man->bdev);
-        struct nouveau_mmu *mmu = nvkm_mmu(&drm->device);
+        struct nouveau_mmu *mmu = nvxx_mmu(&drm->device);
         struct nv04_mmu_priv *priv = (void *)mmu;
         struct nouveau_vm *vm = NULL;
         nouveau_vm_ref(priv->vm, &vm, NULL);
@@ -354,8 +354,8 @@ nouveau_ttm_init(struct nouveau_drm *drm)
         u32 bits;
         int ret;
 
-        bits = nvkm_mmu(&drm->device)->dma_bits;
-        if (nv_device_is_pci(nvkm_device(&drm->device))) {
+        bits = nvxx_mmu(&drm->device)->dma_bits;
+        if (nv_device_is_pci(nvxx_device(&drm->device))) {
                 if (drm->agp.stat == ENABLED ||
                      !pci_dma_supported(dev->pdev, DMA_BIT_MASK(bits)))
                         bits = 32;
@@ -396,12 +396,12 @@ nouveau_ttm_init(struct nouveau_drm *drm)
                 return ret;
         }
 
-        drm->ttm.mtrr = arch_phys_wc_add(nv_device_resource_start(nvkm_device(&drm->device), 1),
-                                         nv_device_resource_len(nvkm_device(&drm->device), 1));
+        drm->ttm.mtrr = arch_phys_wc_add(nv_device_resource_start(nvxx_device(&drm->device), 1),
+                                         nv_device_resource_len(nvxx_device(&drm->device), 1));
 
         /* GART init */
         if (drm->agp.stat != ENABLED) {
-                drm->gem.gart_available = nvkm_mmu(&drm->device)->limit;
+                drm->gem.gart_available = nvxx_mmu(&drm->device)->limit;
         } else {
                 drm->gem.gart_available = drm->agp.size;
         }
diff --git a/drivers/gpu/drm/nouveau/nv04_fence.c b/drivers/gpu/drm/nouveau/nv04_fence.c
index f9859deb108a..af0eaa7bcb33 100644
--- a/drivers/gpu/drm/nouveau/nv04_fence.c
+++ b/drivers/gpu/drm/nouveau/nv04_fence.c
@@ -57,7 +57,7 @@ nv04_fence_sync(struct nouveau_fence *fence,
 static u32
 nv04_fence_read(struct nouveau_channel *chan)
 {
-        struct nouveau_fifo_chan *fifo = nvkm_fifo_chan(chan);;
+        struct nouveau_fifo_chan *fifo = nvxx_fifo_chan(chan);;
         return atomic_read(&fifo->refcnt);
 }
 
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 113e8cdb0b2b..bba84448144e 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -200,7 +200,7 @@ nv50_dmac_destroy(struct nv50_dmac *dmac, struct nvif_object *disp)
         nv50_chan_destroy(&dmac->base);
 
         if (dmac->ptr) {
-                struct pci_dev *pdev = nvkm_device(nvif_device(disp))->pdev;
+                struct pci_dev *pdev = nvxx_device(nvif_device(disp))->pdev;
                 pci_free_consistent(pdev, PAGE_SIZE, dmac->ptr, dmac->handle);
         }
 }
@@ -217,7 +217,7 @@ nv50_dmac_create(struct nvif_object *disp, const u32 *oclass, u8 head,
 
         mutex_init(&dmac->lock);
 
-        dmac->ptr = pci_alloc_consistent(nvkm_device(device)->pdev,
+        dmac->ptr = pci_alloc_consistent(nvxx_device(device)->pdev,
                                          PAGE_SIZE, &dmac->handle);
         if (!dmac->ptr)
                 return -ENOMEM;
@@ -420,9 +420,9 @@ evo_wait(void *evoc, int nr)
                 dmac->ptr[put] = 0x20000000;
 
                 nvif_wr32(&dmac->base.user, 0x0000, 0x00000000);
-                if (!nvkm_wait(&dmac->base.user, 0x0004, ~0, 0x00000000)) {
+                if (!nvxx_wait(&dmac->base.user, 0x0004, ~0, 0x00000000)) {
                         mutex_unlock(&dmac->lock);
-                        nv_error(nvkm_object(&dmac->base.user), "channel stalled\n");
+                        nv_error(nvxx_object(&dmac->base.user), "channel stalled\n");
                         return NULL;
                 }
 
@@ -480,7 +480,7 @@ evo_sync(struct drm_device *dev)
                 evo_data(push, 0x00000000);
                 evo_data(push, 0x00000000);
                 evo_kick(push, mast);
-                if (nv_wait_cb(nvkm_device(device), evo_sync_wait, disp->sync))
+                if (nv_wait_cb(nvxx_device(device), evo_sync_wait, disp->sync))
                         return 0;
         }
 
@@ -535,7 +535,7 @@ nv50_display_flip_stop(struct drm_crtc *crtc)
                 evo_kick(push, flip.chan);
         }
 
-        nv_wait_cb(nvkm_device(device), nv50_display_flip_wait, &flip);
+        nv_wait_cb(nvxx_device(device), nv50_display_flip_wait, &flip);
 }
 
 int
@@ -1677,7 +1677,7 @@ static int
 nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe)
 {
         struct nouveau_drm *drm = nouveau_drm(connector->dev);
-        struct nouveau_i2c *i2c = nvkm_i2c(&drm->device);
+        struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);
         struct nouveau_encoder *nv_encoder;
         struct drm_encoder *encoder;
         int type = DRM_MODE_ENCODER_DAC;
@@ -2062,7 +2062,7 @@ static int
 nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
 {
         struct nouveau_drm *drm = nouveau_drm(connector->dev);
-        struct nouveau_i2c *i2c = nvkm_i2c(&drm->device);
+        struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);
         struct nouveau_encoder *nv_encoder;
         struct drm_encoder *encoder;
         int type;
@@ -2233,7 +2233,7 @@ static int
 nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
 {
         struct nouveau_drm *drm = nouveau_drm(connector->dev);
-        struct nouveau_i2c *i2c = nvkm_i2c(&drm->device);
+        struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);
         struct nouveau_i2c_port *ddc = NULL;
         struct nouveau_encoder *nv_encoder;
         struct drm_encoder *encoder;
diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c
index cb5b88938d45..46fe1fb5c9be 100644
--- a/drivers/gpu/drm/nouveau/nv84_fence.c
+++ b/drivers/gpu/drm/nouveau/nv84_fence.c
@@ -213,7 +213,7 @@ nv84_fence_destroy(struct nouveau_drm *drm)
 int
 nv84_fence_create(struct nouveau_drm *drm)
 {
-        struct nouveau_fifo *pfifo = nvkm_fifo(&drm->device);
+        struct nouveau_fifo *pfifo = nvxx_fifo(&drm->device);
         struct nv84_fence_priv *priv;
         int ret;