1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index 52068a0910dc..394c89abcc97 100644
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
@@ -154,7 +154,6 @@ nv50_fbcon_accel_init(struct fb_info *info)
         struct drm_device *dev = nfbdev->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nouveau_channel *chan = drm->channel;
-        struct nouveau_object *object;
         int ret, format;
 
         switch (info->var.bits_per_pixel) {
@@ -184,8 +183,8 @@ nv50_fbcon_accel_init(struct fb_info *info)
                 return -EINVAL;
         }
 
-        ret = nouveau_object_new(nv_object(chan->cli), NVDRM_CHAN, Nv2D,
-                                 0x502d, NULL, 0, &object);
+        ret = nvif_object_init(chan->object, NULL, 0x502d, 0x502d, NULL, 0,
+                               &nfbdev->twod);
         if (ret)
                 return ret;
 
@@ -196,11 +195,11 @@ nv50_fbcon_accel_init(struct fb_info *info)
         }
 
         BEGIN_NV04(chan, NvSub2D, 0x0000, 1);
-        OUT_RING(chan, Nv2D);
+        OUT_RING(chan, nfbdev->twod.handle);
         BEGIN_NV04(chan, NvSub2D, 0x0184, 3);
-        OUT_RING(chan, NvDmaFB);
-        OUT_RING(chan, NvDmaFB);
-        OUT_RING(chan, NvDmaFB);
+        OUT_RING(chan, chan->vram.handle);
+        OUT_RING(chan, chan->vram.handle);
+        OUT_RING(chan, chan->vram.handle);
         BEGIN_NV04(chan, NvSub2D, 0x0290, 1);
         OUT_RING(chan, 0);
         BEGIN_NV04(chan, NvSub2D, 0x0888, 1);