diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:23 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:43:30 +1000 |
| commit | d292e49c8ed37e05ca982253b4a00a89c6777580 (patch) | |
| tree | fa001b4f546f6a77a1c6988f6233575ac24395db /drm/nv17_fence.c | |
| parent | 42474e46534736ec5c1c9cfafa99e29aa1f11571 (diff) | |
| download | nouveau-d292e49c8ed37e05ca982253b4a00a89c6777580.tar.gz | |
drm: remove (most) hardcoded object handle usage
The PFIFO<->EVO sync buffers will be fixed up later when inter-channel
sync in general is improved.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nv17_fence.c')
| -rw-r--r-- | drm/nv17_fence.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drm/nv17_fence.c b/drm/nv17_fence.c index 4dde5320d..505613173 100644 --- a/drm/nv17_fence.c +++ b/drm/nv17_fence.c @@ -35,6 +35,7 @@ nv17_fence_sync(struct nouveau_fence *fence, { struct nouveau_cli *cli = (void *)nvif_client(&prev->device->base); struct nv10_fence_priv *priv = chan->drm->fence; + struct nv10_fence_chan *fctx = chan->fence; u32 value; int ret; @@ -49,7 +50,7 @@ nv17_fence_sync(struct nouveau_fence *fence, ret = RING_SPACE(prev, 5); if (!ret) { BEGIN_NV04(prev, 0, NV11_SUBCHAN_DMA_SEMAPHORE, 4); - OUT_RING (prev, NvSema); + OUT_RING (prev, fctx->sema.handle); OUT_RING (prev, 0); OUT_RING (prev, value + 0); OUT_RING (prev, value + 1); @@ -58,7 +59,7 @@ nv17_fence_sync(struct nouveau_fence *fence, if (!ret && !(ret = RING_SPACE(chan, 5))) { BEGIN_NV04(chan, 0, NV11_SUBCHAN_DMA_SEMAPHORE, 4); - OUT_RING (chan, NvSema); + OUT_RING (chan, fctx->sema.handle); OUT_RING (chan, 0); OUT_RING (chan, value + 1); OUT_RING (chan, value + 2); |