aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv04_fence.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-02-13 22:20:17 -0500
committerBen Skeggs <bskeggs@redhat.com>2013-02-20 01:00:53 -0500
commit827520ce06568f699dad275dcca61647cce08757 (patch)
tree707c9ab051ca1bd8a14f14fb153510c7fbf133c3 /drivers/gpu/drm/nouveau/nv04_fence.c
parent60e5cb79cbd27a36836fc04177d7c323ee873563 (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/nv04_fence.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv04_fence.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_fence.c b/drivers/gpu/drm/nouveau/nv04_fence.c
index a220b94ba9f2..94eadd1dd10a 100644
--- a/drivers/gpu/drm/nouveau/nv04_fence.c
+++ b/drivers/gpu/drm/nouveau/nv04_fence.c
@@ -78,6 +78,9 @@ nv04_fence_context_new(struct nouveau_channel *chan)
78 struct nv04_fence_chan *fctx = kzalloc(sizeof(*fctx), GFP_KERNEL); 78 struct nv04_fence_chan *fctx = kzalloc(sizeof(*fctx), GFP_KERNEL);
79 if (fctx) { 79 if (fctx) {
80 nouveau_fence_context_new(&fctx->base); 80 nouveau_fence_context_new(&fctx->base);
81 fctx->base.emit = nv04_fence_emit;
82 fctx->base.sync = nv04_fence_sync;
83 fctx->base.read = nv04_fence_read;
81 chan->fence = fctx; 84 chan->fence = fctx;
82 return 0; 85 return 0;
83 } 86 }
@@ -104,8 +107,5 @@ nv04_fence_create(struct nouveau_drm *drm)
104 priv->base.dtor = nv04_fence_destroy; 107 priv->base.dtor = nv04_fence_destroy;
105 priv->base.context_new = nv04_fence_context_new; 108 priv->base.context_new = nv04_fence_context_new;
106 priv->base.context_del = nv04_fence_context_del; 109 priv->base.context_del = nv04_fence_context_del;
107 priv->base.emit = nv04_fence_emit;
108 priv->base.sync = nv04_fence_sync;
109 priv->base.read = nv04_fence_read;
110 return 0; 110 return 0;
111} 111}