diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-10-20 15:49:33 +1000 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2014-10-31 11:47:40 +0900 |
| commit | 6847d0a8e5d2acac68d7795d1b92f083550f40b8 (patch) | |
| tree | 2ff9e9e1b5fbd6696282eb9fee492ad0d20f7d45 | |
| parent | 3faa6c9d4ce12f24f4d84f6db454f83a1fbcc126 (diff) | |
| download | nouveau-6847d0a8e5d2acac68d7795d1b92f083550f40b8.tar.gz | |
drm: fix regression on agp boards
Extends the fix in f2f9a2cbaf019481feefe231f996d3602612fa99 to also
workaround permission issues noticed by people using AGP systems.
Cc: stable@vger.kernel.org # 3.16: f2f9a2c: drm/nouveau: fix regression
Cc: stable@vger.kernel.org # 3.16+
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau_chan.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drm/nouveau_chan.c b/drm/nouveau_chan.c index fd3dbd59d..77c81d6b4 100644 --- a/drm/nouveau_chan.c +++ b/drm/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 |