drm/nv50/bar: fix plymouth issues on certain efi macbooks
authorBen Skeggs <bskeggs@redhat.com>
Tue, 4 Mar 2014 05:45:35 +0000 (15:45 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 26 Mar 2014 04:08:14 +0000 (14:08 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c

index baa2b62bd40fec21e15aee1146d0da7727566517..f748ba49dfc8c941c1fae80039c7d2a24b8cea50 100644 (file)
@@ -231,7 +231,7 @@ static int
 nv50_bar_init(struct nouveau_object *object)
 {
        struct nv50_bar_priv *priv = (void *)object;
-       int ret;
+       int ret, i;
 
        ret = nouveau_bar_init(&priv->base);
        if (ret)
@@ -249,6 +249,8 @@ nv50_bar_init(struct nouveau_object *object)
        nv_wr32(priv, 0x001704, 0x40000000 | priv->mem->addr >> 12);
        nv_wr32(priv, 0x001708, 0x80000000 | priv->bar1->node->offset >> 4);
        nv_wr32(priv, 0x00170c, 0x80000000 | priv->bar3->node->offset >> 4);
+       for (i = 0; i < 8; i++)
+               nv_wr32(priv, 0x001900 + (i * 4), 0x00000000);
        return 0;
 }