diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-10-21 13:27:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-10-21 13:27:55 +1000 |
| commit | 26beaee9bb07be20cc641c1251152e280e80f54e (patch) | |
| tree | c8b76fe4a2caa1534b565e9b34535056184afa20 /drivers/gpu/drm/etnaviv/etnaviv_mmu.c | |
| parent | 96ebf7cb9fe6cf356fe455ee159a2cea06ff9014 (diff) | |
| parent | 8814d2dce00f77c5eeb7278981ac6fd08835629e (diff) | |
| download | linux-26beaee9bb07be20cc641c1251152e280e80f54e.tar.gz | |
Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/lst/linux into drm-fixes
2 more patches to stabilize the new MMUv2 support.
* 'drm-etnaviv-fixes' of git://git.pengutronix.de/lst/linux:
drm/etnaviv: block 64K of address space behind each cmdstream
drm/etnaviv: ensure write caches are flushed at end of user cmdstream
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_mmu.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c index d3796ed8d8c5..169ac96e8f08 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c @@ -330,7 +330,8 @@ u32 etnaviv_iommu_get_cmdbuf_va(struct etnaviv_gpu *gpu, return (u32)buf->vram_node.start; mutex_lock(&mmu->lock); - ret = etnaviv_iommu_find_iova(mmu, &buf->vram_node, buf->size); + ret = etnaviv_iommu_find_iova(mmu, &buf->vram_node, + buf->size + SZ_64K); if (ret < 0) { mutex_unlock(&mmu->lock); return 0; |