aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_fence.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-05-04 16:25:47 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-05-24 16:55:58 +1000
commit906c033e276877c1374c9159976b05746af3c86d (patch)
treef7e03b7148cf9f5caad6ac72b33e0354e94aad41 /drivers/gpu/drm/nouveau/nouveau_fence.h
parent299bee10fb228fce4a3fc5dd89f32787a6e58fe5 (diff)
downloadkernel_goldelico_gta04-906c033e276877c1374c9159976b05746af3c86d.zip
kernel_goldelico_gta04-906c033e276877c1374c9159976b05746af3c86d.tar.gz
kernel_goldelico_gta04-906c033e276877c1374c9159976b05746af3c86d.tar.bz2
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/nouveau_fence.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_fence.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h
index ec9afa7..82ba733 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.h
@@ -34,7 +34,8 @@ struct nouveau_fence_chan {
struct nouveau_fence_priv {
struct nouveau_exec_engine engine;
int (*emit)(struct nouveau_fence *);
- int (*sync)(struct nouveau_fence *, struct nouveau_channel *);
+ int (*sync)(struct nouveau_fence *, struct nouveau_channel *,
+ struct nouveau_channel *);
u32 (*read)(struct nouveau_channel *);
};