diff options
| author | Ben Skeggs | 2014-08-09 20:10:23 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2014-08-09 21:13:15 +0200 |
| commit | f45f55c4bbf8a9f9c607e5f6013abac60427e3f7 (patch) | |
| tree | 17aa46b435a9708f6c8331796afdd83c750322c6 /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | drm/nouveau: port to nvif client/device/objects (diff) | |
| download | kernel-qcow2-linux-f45f55c4bbf8a9f9c607e5f6013abac60427e3f7.tar.gz kernel-qcow2-linux-f45f55c4bbf8a9f9c607e5f6013abac60427e3f7.tar.xz kernel-qcow2-linux-f45f55c4bbf8a9f9c607e5f6013abac60427e3f7.zip | |
drm/nouveau: 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 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index d222875a58d5..23146ce53526 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -765,9 +765,9 @@ nv50_bo_move_init(struct nouveau_channel *chan, u32 handle) BEGIN_NV04(chan, NvSubCopy, 0x0000, 1); OUT_RING (chan, handle); BEGIN_NV04(chan, NvSubCopy, 0x0180, 3); - OUT_RING (chan, NvNotify0); - OUT_RING (chan, NvDmaFB); - OUT_RING (chan, NvDmaFB); + OUT_RING (chan, chan->drm->ntfy.handle); + OUT_RING (chan, chan->vram.handle); + OUT_RING (chan, chan->vram.handle); } return ret; @@ -854,7 +854,7 @@ nv04_bo_move_init(struct nouveau_channel *chan, u32 handle) BEGIN_NV04(chan, NvSubCopy, 0x0000, 1); OUT_RING (chan, handle); BEGIN_NV04(chan, NvSubCopy, 0x0180, 1); - OUT_RING (chan, NvNotify0); + OUT_RING (chan, chan->drm->ntfy.handle); } return ret; @@ -866,7 +866,7 @@ nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo, { if (mem->mem_type == TTM_PL_TT) return NvDmaTT; - return NvDmaFB; + return chan->vram.handle; } static int |