Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome...

[cascardo/linux.git] / drivers / gpu / drm / nouveau / nvc0_fbcon.c

diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index 9dcd30f..6124667 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
@@ -154,11 +154,10 @@ nvc0_fbcon_accel_init(struct fb_info *info)
        struct nouveau_framebuffer *fb = &nfbdev->nouveau_fb;
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nouveau_channel *chan = drm->channel;
-       struct nouveau_object *object;
        int ret, format;
 
-       ret = nouveau_object_new(nv_object(chan->cli), NVDRM_CHAN, Nv2D,
-                                0x902d, NULL, 0, &object);
+       ret = nvif_object_init(chan->object, NULL, 0x902d, 0x902d, NULL, 0,
+                              &nfbdev->twod);
        if (ret)
                return ret;
 
@@ -197,7 +196,7 @@ nvc0_fbcon_accel_init(struct fb_info *info)
        }
 
        BEGIN_NVC0(chan, NvSub2D, 0x0000, 1);
-       OUT_RING  (chan, 0x0000902d);
+       OUT_RING  (chan, nfbdev->twod.handle);
        BEGIN_NVC0(chan, NvSub2D, 0x0290, 1);
        OUT_RING  (chan, 0);
        BEGIN_NVC0(chan, NvSub2D, 0x0888, 1);