diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2019-02-15 03:35:05 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2019-02-20 02:00:03 +0300 |
| commit | 6c762d1b18d77ea52dab08c94ec219c3a64854e1 (patch) | |
| tree | e9e72afc919ccd98473e0a3033c49ec281966dd7 /drivers/gpu | |
| parent | f180bf12ac061f093abb9247505f661817973cae (diff) | |
| download | linux-6c762d1b18d77ea52dab08c94ec219c3a64854e1.tar.xz | |
drm/nouveau/dmem: extend copy function to allow direct use of physical addresses
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dmem.c | 56 |
1 files changed, 50 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index b8ba338df1fb..832d078beea2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -46,8 +46,15 @@ struct nouveau_migrate; +enum nouveau_aper { + NOUVEAU_APER_VIRT, + NOUVEAU_APER_VRAM, + NOUVEAU_APER_HOST, +}; + typedef int (*nouveau_migrate_copy_t)(struct nouveau_drm *drm, u64 npages, - u64 dst_addr, u64 src_addr); + enum nouveau_aper, u64 dst_addr, + enum nouveau_aper, u64 src_addr); struct nouveau_dmem_chunk { struct list_head list; @@ -267,7 +274,8 @@ nouveau_dmem_fault_alloc_and_copy(struct vm_area_struct *vma, src_addr = page_to_pfn(spage) - chunk->pfn_first; src_addr = (src_addr << PAGE_SHIFT) + chunk->vma.addr; - ret = copy(drm, 1, dst_addr, src_addr); + ret = copy(drm, 1, NOUVEAU_APER_VIRT, dst_addr, + NOUVEAU_APER_VIRT, src_addr); if (ret) { dst_pfns[i] = MIGRATE_PFN_ERROR; __free_page(dpage); @@ -588,15 +596,49 @@ nouveau_dmem_fini(struct nouveau_drm *drm) static int nvc0b5_migrate_copy(struct nouveau_drm *drm, u64 npages, - u64 dst_addr, u64 src_addr) + enum nouveau_aper dst_aper, u64 dst_addr, + enum nouveau_aper src_aper, u64 src_addr) { struct nouveau_channel *chan = drm->dmem->migrate.chan; + u32 launch_dma = (1 << 9) /* MULTI_LINE_ENABLE. */ | + (1 << 8) /* DST_MEMORY_LAYOUT_PITCH. */ | + (1 << 7) /* SRC_MEMORY_LAYOUT_PITCH. */ | + (1 << 2) /* FLUSH_ENABLE_TRUE. */ | + (2 << 0) /* DATA_TRANSFER_TYPE_NON_PIPELINED. */; int ret; - ret = RING_SPACE(chan, 10); + ret = RING_SPACE(chan, 13); if (ret) return ret; + if (src_aper != NOUVEAU_APER_VIRT) { + switch (src_aper) { + case NOUVEAU_APER_VRAM: + BEGIN_IMC0(chan, NvSubCopy, 0x0260, 0); + break; + case NOUVEAU_APER_HOST: + BEGIN_IMC0(chan, NvSubCopy, 0x0260, 1); + break; + default: + return -EINVAL; + } + launch_dma |= 0x00001000; /* SRC_TYPE_PHYSICAL. */ + } + + if (dst_aper != NOUVEAU_APER_VIRT) { + switch (dst_aper) { + case NOUVEAU_APER_VRAM: + BEGIN_IMC0(chan, NvSubCopy, 0x0264, 0); + break; + case NOUVEAU_APER_HOST: + BEGIN_IMC0(chan, NvSubCopy, 0x0264, 1); + break; + default: + return -EINVAL; + } + launch_dma |= 0x00002000; /* DST_TYPE_PHYSICAL. */ + } + BEGIN_NVC0(chan, NvSubCopy, 0x0400, 8); OUT_RING (chan, upper_32_bits(src_addr)); OUT_RING (chan, lower_32_bits(src_addr)); @@ -606,7 +648,8 @@ nvc0b5_migrate_copy(struct nouveau_drm *drm, u64 npages, OUT_RING (chan, PAGE_SIZE); OUT_RING (chan, PAGE_SIZE); OUT_RING (chan, npages); - BEGIN_IMC0(chan, NvSubCopy, 0x0300, 0x0386); + BEGIN_NVC0(chan, NvSubCopy, 0x0300, 1); + OUT_RING (chan, launch_dma); return 0; } @@ -761,7 +804,8 @@ nouveau_dmem_migrate_alloc_and_copy(struct vm_area_struct *vma, src_addr = migrate->hmem.vma.addr + (c << PAGE_SHIFT); c++; - ret = copy(drm, 1, dst_addr, src_addr); + ret = copy(drm, 1, NOUVEAU_APER_VIRT, dst_addr, + NOUVEAU_APER_VIRT, src_addr); if (ret) { nouveau_dmem_page_free_locked(drm, dpage); dst_pfns[i] = 0; |