diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-05-10 12:42:26 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-02-17 15:15:01 +1000 |
| commit | d2ee360564dca43cbfb2bd8ceead7671c87962d2 (patch) | |
| tree | a2dee52a4365a000a3fc6202389f480cdec1d457 /drivers/gpu/drm/nouveau/nvkm/falcon/v1.c | |
| parent | 134fdc1a704f0042465ea993c33540aaec7e1d2e (diff) | |
drm/nouveau/core/memory: distinguish between coherent/non-coherent targets
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/falcon/v1.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/falcon/v1.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/v1.c b/drivers/gpu/drm/nouveau/nvkm/falcon/v1.c index 24a295858287..b537f111f39c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/falcon/v1.c +++ b/drivers/gpu/drm/nouveau/nvkm/falcon/v1.c @@ -136,10 +136,13 @@ nvkm_falcon_v1_bind_context(struct nvkm_falcon *falcon, struct nvkm_gpuobj *ctx) nvkm_falcon_wr32(falcon, 0xe00 + 4 * FALCON_DMAIDX_PHYS_SYS_NCOH, 0x6); /* Set context */ - if (nvkm_memory_target(ctx->memory) == NVKM_MEM_TARGET_VRAM) - inst_loc = 0x0; /* FB */ - else - inst_loc = 0x3; /* Non-coherent sysmem */ + switch (nvkm_memory_target(ctx->memory)) { + case NVKM_MEM_TARGET_VRAM: inst_loc = 0; break; + case NVKM_MEM_TARGET_NCOH: inst_loc = 3; break; + default: + WARN_ON(1); + return; + } /* Enable context */ nvkm_falcon_mask(falcon, 0x048, 0x1, 0x1); |