drm/nouveau/fifo/gk104: take runlist target into account

Bits 28:29 of RUNLIST_BASE specify the memory target of the runlist. Set
it to 0x3 (SYS_MEM_NONCOHERENT) if the runlist object resides in system
memory.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
index d6a88cf67416c46aa7e72332dfc87158edc70e52..cd0f08a2f811ff26d24a3018a46d1fea27071130 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
@@ -55,6 +55,7 @@ gk104_fifo_runlist_commit(struct gk104_fifo *fifo, u32 engine)
        struct nvkm_device *device = subdev->device;
        struct nvkm_memory *cur;
        int nr = 0;
+       int target;
 
        mutex_lock(&subdev->mutex);
        cur = engn->runlist[engn->cur_runlist];
@@ -68,7 +69,10 @@ gk104_fifo_runlist_commit(struct gk104_fifo *fifo, u32 engine)
        }
        nvkm_done(cur);
 
-       nvkm_wr32(device, 0x002270, nvkm_memory_addr(cur) >> 12);
+       target = (nvkm_memory_target(cur) == NVKM_MEM_TARGET_HOST) ? 0x3 : 0x0;
+
+       nvkm_wr32(device, 0x002270, (nvkm_memory_addr(cur) >> 12) |
+                                   (target << 28));
        nvkm_wr32(device, 0x002274, (engine << 20) | nr);
 
        if (wait_event_timeout(engn->wait, !(nvkm_rd32(device, 0x002284 +