diff options
| author | Ben Skeggs | 2014-10-20 07:49:33 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2014-12-02 06:43:38 +0100 |
| commit | 4894f6628e1ae04b2cc6222df692364c1ac1250f (patch) | |
| tree | 31e5d63937b57bc88dceca3ff9e0642f69343a45 /drivers/gpu/drm/nouveau/nouveau_chan.c | |
| parent | soc/tegra: fuse: export tegra_sku_info (diff) | |
| download | kernel-qcow2-linux-4894f6628e1ae04b2cc6222df692364c1ac1250f.tar.gz kernel-qcow2-linux-4894f6628e1ae04b2cc6222df692364c1ac1250f.tar.xz kernel-qcow2-linux-4894f6628e1ae04b2cc6222df692364c1ac1250f.zip | |
drm/nouveau: a, somehow, missed hunk of "fix regression on agp boards"
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_chan.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index fd3dbd59d73e..77c81d6b45ee 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -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 |