OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9fc366
)
drm/nouveau: a, somehow, missed hunk of "fix regression on agp boards"
author
Ben Skeggs
<bskeggs@redhat.com>
Mon, 20 Oct 2014 05:49:33 +0000
(15:49 +1000)
committer
Ben 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
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_chan.c
b/drivers/gpu/drm/nouveau/nouveau_chan.c
index
fd3dbd5
..
77c81d6
100644
(file)
--- 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