From 24f25db311d84066246a305ba3558b99239d7aab Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 31 Oct 2014 17:14:43 +0000 Subject: [PATCH 3/5] Revert "drm/nouveau: fix regression on original nv50 board" This reverts commit 90ab570e763ae868a32c949cdf6aad2c19a1c5ce. Signed-off-by: Andy Whitcroft --- drivers/gpu/drm/nouveau/nouveau_chan.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index dc5a5c9..ccb6b45 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -272,7 +272,6 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) struct nouveau_object *object; struct nv_dma_class args = {}; int ret, i; - bool save; /* allocate dma objects to cover all allowed vram, and gart */ if (device->card_type < NV_C0) { @@ -368,11 +367,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 -- 2.1.1