diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-05-04 08:25:47 +0200 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 08:55:58 +0200 |
commit | 906c033e276877c1374c9159976b05746af3c86d (patch) | |
tree | f7e03b7148cf9f5caad6ac72b33e0354e94aad41 /drivers/gpu/drm/nouveau/nv10_fence.c | |
parent | drm/nouveau/bios: fix some shadowing issues, particularly acpi (diff) | |
download | linux-906c033e276877c1374c9159976b05746af3c86d.tar.xz linux-906c033e276877c1374c9159976b05746af3c86d.zip |
drm/nouveau/fence: fix a race where fence->channel can disappear
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv10_fence.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv10_fence.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c index 10831eaff958..8a1b75009185 100644 --- a/drivers/gpu/drm/nouveau/nv10_fence.c +++ b/drivers/gpu/drm/nouveau/nv10_fence.c @@ -52,17 +52,19 @@ nv10_fence_emit(struct nouveau_fence *fence) return ret; } + static int -nv10_fence_sync(struct nouveau_fence *fence, struct nouveau_channel *chan) +nv10_fence_sync(struct nouveau_fence *fence, + struct nouveau_channel *prev, struct nouveau_channel *chan) { return -ENODEV; } static int -nv17_fence_sync(struct nouveau_fence *fence, struct nouveau_channel *chan) +nv17_fence_sync(struct nouveau_fence *fence, + struct nouveau_channel *prev, struct nouveau_channel *chan) { struct nv10_fence_priv *priv = nv_engine(chan->dev, NVOBJ_ENGINE_FENCE); - struct nouveau_channel *prev = fence->channel; u32 value; int ret; |