diff options
| author | Ben Skeggs | 2012-05-04 08:25:47 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2012-05-24 08:55:58 +0200 |
| commit | 906c033e276877c1374c9159976b05746af3c86d (patch) | |
| tree | f7e03b7148cf9f5caad6ac72b33e0354e94aad41 /drivers/gpu/drm/nouveau/nv84_fence.c | |
| parent | drm/nouveau/bios: fix some shadowing issues, particularly acpi (diff) | |
| download | kernel-qcow2-linux-906c033e276877c1374c9159976b05746af3c86d.tar.gz kernel-qcow2-linux-906c033e276877c1374c9159976b05746af3c86d.tar.xz kernel-qcow2-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/nv84_fence.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv84_fence.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c index d23dbc06f436..0ac98c0efc71 100644 --- a/drivers/gpu/drm/nouveau/nv84_fence.c +++ b/drivers/gpu/drm/nouveau/nv84_fence.c @@ -55,16 +55,18 @@ nv84_fence_emit(struct nouveau_fence *fence) return ret; } + static int -nv84_fence_sync(struct nouveau_fence *fence, struct nouveau_channel *chan) +nv84_fence_sync(struct nouveau_fence *fence, + struct nouveau_channel *prev, struct nouveau_channel *chan) { int ret = RING_SPACE(chan, 7); if (ret == 0) { BEGIN_NV04(chan, 0, NV11_SUBCHAN_DMA_SEMAPHORE, 1); OUT_RING (chan, NvSema); BEGIN_NV04(chan, 0, NV84_SUBCHAN_SEMAPHORE_ADDRESS_HIGH, 4); - OUT_RING (chan, upper_32_bits(fence->channel->id * 16)); - OUT_RING (chan, lower_32_bits(fence->channel->id * 16)); + OUT_RING (chan, upper_32_bits(prev->id * 16)); + OUT_RING (chan, lower_32_bits(prev->id * 16)); OUT_RING (chan, fence->sequence); OUT_RING (chan, NV84_SUBCHAN_SEMAPHORE_TRIGGER_ACQUIRE_GEQUAL); FIRE_RING (chan); |