1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 201b52b750dd..ca5397beb357 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -175,11 +175,11 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv)
 }
 
 int
-nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain,
+nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain,
                 uint32_t tile_mode, uint32_t tile_flags,
                 struct nouveau_bo **pnvbo)
 {
-        struct nouveau_drm *drm = nouveau_drm(dev);
+        struct nouveau_drm *drm = nouveau_drm(cli->dev);
         struct nouveau_bo *nvbo;
         u32 flags = 0;
         int ret;
@@ -194,7 +194,7 @@ nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain,
         if (domain & NOUVEAU_GEM_DOMAIN_COHERENT)
                 flags |= TTM_PL_FLAG_UNCACHED;
 
-        ret = nouveau_bo_new(dev, size, align, flags, tile_mode,
+        ret = nouveau_bo_new(cli, size, align, flags, tile_mode,
                              tile_flags, NULL, NULL, pnvbo);
         if (ret)
                 return ret;
@@ -206,12 +206,12 @@ nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain,
          */
         nvbo->valid_domains = NOUVEAU_GEM_DOMAIN_VRAM |
                               NOUVEAU_GEM_DOMAIN_GART;
-        if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA)
+        if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)
                 nvbo->valid_domains &= domain;
 
         /* Initialize the embedded gem-object. We return a single gem-reference
          * to the caller, instead of a normal nouveau_bo ttm reference. */
-        ret = drm_gem_object_init(dev, &nvbo->gem, nvbo->bo.mem.size);
+        ret = drm_gem_object_init(drm->dev, &nvbo->gem, nvbo->bo.mem.size);
         if (ret) {
                 nouveau_bo_ref(NULL, pnvbo);
                 return -ENOMEM;
@@ -257,7 +257,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 nvkm_fb *fb = nvxx_fb(&drm->device);
+        struct nvkm_fb *fb = nvxx_fb(&drm->client.device);
         struct drm_nouveau_gem_new *req = data;
         struct nouveau_bo *nvbo = NULL;
         int ret = 0;
@@ -267,7 +267,7 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
 
-        ret = nouveau_gem_new(dev, req->info.size, req->align,
+        ret = nouveau_gem_new(cli, req->info.size, req->align,
                               req->info.domain, req->info.tile_mode,
                               req->info.tile_flags, &nvbo);
         if (ret)
@@ -496,7 +496,7 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli,
                         return ret;
                 }
 
-                if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) {
+                if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {
                         if (nvbo->bo.offset == b->presumed.offset &&
                             ((nvbo->bo.mem.mem_type == TTM_PL_VRAM &&
                               b->presumed.domain & NOUVEAU_GEM_DOMAIN_VRAM) ||
@@ -767,7 +767,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                                       push[i].length);
                 }
         } else
-        if (drm->device.info.chipset >= 0x25) {
+        if (drm->client.device.info.chipset >= 0x25) {
                 ret = RING_SPACE(chan, req->nr_push * 2);
                 if (ret) {
                         NV_PRINTK(err, cli, "cal_space: %d\n", ret);
@@ -840,7 +840,7 @@ out_next:
                 req->suffix0 = 0x00000000;
                 req->suffix1 = 0x00000000;
         } else
-        if (drm->device.info.chipset >= 0x25) {
+        if (drm->client.device.info.chipset >= 0x25) {
                 req->suffix0 = 0x00020000;
                 req->suffix1 = 0x00000000;
         } else {