diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-05-04 02:25:47 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 02:55:58 -0400 |
commit | 906c033e276877c1374c9159976b05746af3c86d (patch) | |
tree | f7e03b7148cf9f5caad6ac72b33e0354e94aad41 /drivers/gpu/drm/nouveau/nouveau_fence.h | |
parent | 299bee10fb228fce4a3fc5dd89f32787a6e58fe5 (diff) |
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.h | 3 |
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 ec9afa775ea7..82ba733393ae 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 { | |||
34 | struct nouveau_fence_priv { | 34 | struct nouveau_fence_priv { |
35 | struct nouveau_exec_engine engine; | 35 | struct nouveau_exec_engine engine; |
36 | int (*emit)(struct nouveau_fence *); | 36 | int (*emit)(struct nouveau_fence *); |
37 | int (*sync)(struct nouveau_fence *, struct nouveau_channel *); | 37 | int (*sync)(struct nouveau_fence *, struct nouveau_channel *, |
38 | struct nouveau_channel *); | ||
38 | u32 (*read)(struct nouveau_channel *); | 39 | u32 (*read)(struct nouveau_channel *); |
39 | }; | 40 | }; |
40 | 41 | ||