diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-02-13 22:20:17 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 01:00:53 -0500 |
commit | 827520ce06568f699dad275dcca61647cce08757 (patch) | |
tree | 707c9ab051ca1bd8a14f14fb153510c7fbf133c3 /drivers/gpu/drm/nouveau/nv10_fence.c | |
parent | 60e5cb79cbd27a36836fc04177d7c323ee873563 (diff) |
drm/nouveau/fence: make internal hooks part of the context
A step towards being able to provide fences from other engines not
connected to PFIFO.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c index e4f124a48d4e..06f434f03fba 100644 --- a/drivers/gpu/drm/nouveau/nv10_fence.c +++ b/drivers/gpu/drm/nouveau/nv10_fence.c | |||
@@ -75,6 +75,9 @@ nv10_fence_context_new(struct nouveau_channel *chan) | |||
75 | return -ENOMEM; | 75 | return -ENOMEM; |
76 | 76 | ||
77 | nouveau_fence_context_new(&fctx->base); | 77 | nouveau_fence_context_new(&fctx->base); |
78 | fctx->base.emit = nv10_fence_emit; | ||
79 | fctx->base.read = nv10_fence_read; | ||
80 | fctx->base.sync = nv10_fence_sync; | ||
78 | return 0; | 81 | return 0; |
79 | } | 82 | } |
80 | 83 | ||
@@ -102,9 +105,6 @@ nv10_fence_create(struct nouveau_drm *drm) | |||
102 | priv->base.dtor = nv10_fence_destroy; | 105 | priv->base.dtor = nv10_fence_destroy; |
103 | priv->base.context_new = nv10_fence_context_new; | 106 | priv->base.context_new = nv10_fence_context_new; |
104 | priv->base.context_del = nv10_fence_context_del; | 107 | priv->base.context_del = nv10_fence_context_del; |
105 | priv->base.emit = nv10_fence_emit; | ||
106 | priv->base.read = nv10_fence_read; | ||
107 | priv->base.sync = nv10_fence_sync; | ||
108 | spin_lock_init(&priv->lock); | 108 | spin_lock_init(&priv->lock); |
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |