diff options
author | Dmitry Osipenko <digetx@gmail.com> | 2018-07-06 20:02:36 +0200 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2018-07-09 10:31:30 +0200 |
commit | ec58923215dbbeef59ee82923ee94d745f73db58 (patch) | |
tree | 40f8358325acc7055a5b55ff94c87899ea609792 /drivers/gpu | |
parent | gpu: host1x: Skip IOMMU initialization if firewall is enabled (diff) | |
download | linux-ec58923215dbbeef59ee82923ee94d745f73db58.tar.xz linux-ec58923215dbbeef59ee82923ee94d745f73db58.zip |
gpu: host1x: Check whether size of unpin isn't 0
Only gather pins are mapped by the Host1x driver, regular BO relocations
are not. Check whether size of unpin isn't 0, otherwise IOVA allocation at
0x0 could be erroneously released.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/host1x/job.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c index e2f4a4d93d20..527a1cddb14f 100644 --- a/drivers/gpu/host1x/job.c +++ b/drivers/gpu/host1x/job.c @@ -569,7 +569,8 @@ void host1x_job_unpin(struct host1x_job *job) for (i = 0; i < job->num_unpins; i++) { struct host1x_job_unpin_data *unpin = &job->unpins[i]; - if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) && host->domain) { + if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) && + unpin->size && host->domain) { iommu_unmap(host->domain, job->addr_phys[i], unpin->size); free_iova(&host->iova, |