Merge tag 'drm/tegra/for-4.18-rc5' of git://anongit.freedesktop.org/tegra/linux into drm-fixes

drm/tegra: Fixes for v4.18-rc5

This contains a couple of one- or two-line fixes for various minor
issues in the Tegra driver.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180712070142.15571-1-thierry.reding@gmail.com

3 files changed, 6 insertions, 2 deletions

diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 776c1513e582..a2bd5876c633 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -398,7 +398,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
                  * unaligned offset is malformed and cause commands stream
                  * corruption on the buffer address relocation.
                  */
-                if (offset & 3 || offset >= obj->gem.size) {
+                if (offset & 3 || offset > obj->gem.size) {
                         err = -EINVAL;
                         goto fail;
                 }
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index f1d5f76e9c33..d88073e7d22d 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -218,6 +218,9 @@ static int host1x_probe(struct platform_device *pdev)
                 return err;
         }
 
+        if (IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL))
+                goto skip_iommu;
+
         host->group = iommu_group_get(&pdev->dev);
         if (host->group) {
                 struct iommu_domain_geometry *geometry;
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,