drm/nouveau: a, somehow, missed hunk of "fix regression on agp boards"
authorBen Skeggs <bskeggs@redhat.com>
Mon, 20 Oct 2014 05:49:33 +0000 (15:49 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 2 Dec 2014 05:43:38 +0000 (15:43 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_chan.c

index fd3dbd59d73e18113a6ef357e658570c113155be..77c81d6b45ee2ea34add2ffd102815269fb1c916 100644 (file)
@@ -285,7 +285,6 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
        struct nouveau_software_chan *swch;
        struct nv_dma_v0 args = {};
        int ret, i;
-       bool save;
 
        nvif_object_map(chan->object);
 
@@ -387,11 +386,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
        }
 
        /* initialise synchronisation */
-       save = cli->base.super;
-       cli->base.super = true; /* hack until fencenv50 fixed */
-       ret = nouveau_fence(chan->drm)->context_new(chan);
-       cli->base.super = save;
-       return ret;
+       return nouveau_fence(chan->drm)->context_new(chan);
 }
 
 int