diff options
author | Dave Airlie <airlied@redhat.com> | 2018-07-30 02:39:22 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-07-30 02:39:22 +0200 |
commit | 3fce4618279373efc59a91adb16c11da46cd69e5 (patch) | |
tree | 086fad6c9f260a0bcc9b6a3532c6cddc387dd907 /drivers/gpu/host1x/job.c | |
parent | Merge tag 'drm-amdkfd-next-2018-07-28' of git://people.freedesktop.org/~gabba... (diff) | |
parent | Linux 4.18-rc7 (diff) | |
download | linux-3fce4618279373efc59a91adb16c11da46cd69e5.tar.xz linux-3fce4618279373efc59a91adb16c11da46cd69e5.zip |
BackMerge v4.18-rc7 into drm-next
rmk requested this for armada and I think we've had a few
conflicts build up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/host1x/job.c')
-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, |