diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-07-12 15:50:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-07-12 16:50:05 +1000 |
| commit | 8daecf611258d252b3107132d0143752b2e186fc (patch) | |
| tree | 7e10777180fdb971aaaa94893648e4c123ad8981 /drivers/gpu/drm/tegra/gem.c | |
| parent | b45b4f880fb660c4bd4794a2ca3950c4570e12c6 (diff) | |
| parent | 135f4c551d51065ee2d0677bf5344a89767e9d9b (diff) | |
| download | linux-8daecf611258d252b3107132d0143752b2e186fc.tar.gz linux-8daecf611258d252b3107132d0143752b2e186fc.tar.bz2 linux-8daecf611258d252b3107132d0143752b2e186fc.zip | |
Merge tag 'drm/tegra/for-5.20-rc1' of https://gitlab.freedesktop.org/drm/tegra into drm-next
drm/tegra: Changes for v5.20-rc1
The bulk of these changes adds support for context isolation for the
various supported host1x engines, as well as support for the hardware
found on the new Tegra234 SoC generation.
There's also a couple of fixes and cleanups. To round things off, the
device tree bindings are converted to the new json-schema format that
allows DTBs to be validated.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220708181136.673789-1-thierry.reding@gmail.com
Diffstat (limited to 'drivers/gpu/drm/tegra/gem.c')
| -rw-r--r-- | drivers/gpu/drm/tegra/gem.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 7c7dd84e6db8..81991090adcc 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -704,14 +704,23 @@ static int tegra_gem_prime_vmap(struct dma_buf *buf, struct iosys_map *map) { struct drm_gem_object *gem = buf->priv; struct tegra_bo *bo = to_tegra_bo(gem); + void *vaddr; - iosys_map_set_vaddr(map, bo->vaddr); + vaddr = tegra_bo_mmap(&bo->base); + if (IS_ERR(vaddr)) + return PTR_ERR(vaddr); + + iosys_map_set_vaddr(map, vaddr); return 0; } static void tegra_gem_prime_vunmap(struct dma_buf *buf, struct iosys_map *map) { + struct drm_gem_object *gem = buf->priv; + struct tegra_bo *bo = to_tegra_bo(gem); + + tegra_bo_munmap(&bo->base, map->vaddr); } static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = { |