diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2018-11-07 15:35:50 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2018-12-11 13:05:32 -0500 |
| commit | 9fe041f6fdfedd92e15dd81d96475ff04bdf879e (patch) | |
| tree | 031088e4ea1257701903dbe9fd03a9e522086302 /drivers/gpu/drm/msm/adreno/adreno_gpu.c | |
| parent | 575f0485508bb210914d8b45bdd8481d0ecd4a72 (diff) | |
| download | linux-9fe041f6fdfedd92e15dd81d96475ff04bdf879e.tar.gz linux-9fe041f6fdfedd92e15dd81d96475ff04bdf879e.tar.bz2 linux-9fe041f6fdfedd92e15dd81d96475ff04bdf879e.zip | |
drm/msm: Add msm_gem_get_and_pin_iova()
Add a new function to get and pin the iova memory in one
step (basically renaming the old msm_gem_get_iova function)
and switch msm_gem_get_iova() to only allocate an iova but
not map it in the IOMMU. This is only currently used by
msm_ioctl_gem_info() since all other users of of the iova
expect that the memory be immediately available.
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/adreno_gpu.c')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 789f7afe1851..7ab2788e33b6 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -209,7 +209,8 @@ int adreno_hw_init(struct msm_gpu *gpu) if (!ring) continue; - ret = msm_gem_get_iova(ring->bo, gpu->aspace, &ring->iova); + ret = msm_gem_get_and_pin_iova(ring->bo, gpu->aspace, + &ring->iova); if (ret) { ring->iova = 0; DRM_DEV_ERROR(gpu->dev->dev, |