drm/tegra: gem: Remove premature import restrictions

All the display related blocks on Tegra require contiguous memory. Using
the DMA API, there is no knowing at import time which device will end up
using the buffer, so it's not known whether or not an IOMMU will be used
to map the buffer.

Move the check for non-contiguous buffers/mappings to the tegra_dc_pin()
function which is now the earliest point where it is known if a DMA BUF
can be used by the given device or not.

v2: add check for contiguous buffer/mapping in tegra_dc_pin()

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 6dfad56eee2b12bfd1a26a85bf7e8662d28720f9..bc15b430156d0452277edddb842e28792aaa9606 100644 (file)
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -440,13 +440,6 @@ static struct tegra_bo *tegra_bo_import(struct drm_device *drm,
                err = tegra_bo_iommu_map(tegra, bo);
                if (err < 0)
                        goto detach;
-       } else {
-               if (bo->sgt->nents > 1) {
-                       err = -EINVAL;
-                       goto detach;
-               }
-
-               bo->iova = sg_dma_address(bo->sgt->sgl);
        }
 
        bo->gem.import_attach = attach;

diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c
index 163b590be2244e422172510c573d6dae5a12cc03..cadcdd9ea427bf7d16df10b8673130c967ee8579 100644 (file)
--- a/drivers/gpu/drm/tegra/plane.c
+++ b/drivers/gpu/drm/tegra/plane.c
@@ -129,6 +129,17 @@ static int tegra_dc_pin(struct tegra_dc *dc, struct tegra_plane_state *state)
                                goto unpin;
                        }
 
+                       /*
+                        * The display controller needs contiguous memory, so
+                        * fail if the buffer is discontiguous and we fail to
+                        * map its SG table to a single contiguous chunk of
+                        * I/O virtual memory.
+                        */
+                       if (err > 1) {
+                               err = -EINVAL;
+                               goto unpin;
+                       }
+
                        state->iova[i] = sg_dma_address(sgt->sgl);
                        state->sgt[i] = sgt;
                } else {