Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04184b1f authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

drm/tegra: gem: Correct iommu_map_sg() error checking 



iommu_map_sg() doesn't return a error value, but a size of the requested
IOMMU mapping or zero in case of error.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent f68ba691

drivers/gpu/drm/tegra/gem.c

+7 −8
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static const struct host1x_bo_ops tegra_bo_ops = { 
static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo)

{

	int prot = IOMMU_READ | IOMMU_WRITE;

	ssize_t err;

	int err;



	if (bo->mm)

		return -EBUSY;
@@ -128,22 +128,21 @@ static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo) 
	err = drm_mm_insert_node_generic(&tegra->mm,

					 bo->mm, bo->gem.size, PAGE_SIZE, 0, 0);

	if (err < 0) {

		dev_err(tegra->drm->dev, "out of I/O virtual memory: %zd\n",

		dev_err(tegra->drm->dev, "out of I/O virtual memory: %d\n",

			err);

		goto unlock;

	}



	bo->paddr = bo->mm->start;



	err = iommu_map_sg(tegra->domain, bo->paddr, bo->sgt->sgl,

	bo->size = iommu_map_sg(tegra->domain, bo->paddr, bo->sgt->sgl,

				bo->sgt->nents, prot);

	if (err < 0) {

		dev_err(tegra->drm->dev, "failed to map buffer: %zd\n", err);

	if (!bo->size) {

		dev_err(tegra->drm->dev, "failed to map buffer\n");

		err = -ENOMEM;

		goto remove;

	}



	bo->size = err;



	mutex_unlock(&tegra->mm_lock);



	return 0;