Revert "drm/tegra: gem: Don't attach dma-bufs when not needed"

JIRA: https://issues.redhat.com/browse/RHEL-113577
Upstream Status: RHEL only

This reverts commit f5b8794.

This commit was backported automatically as part of the DRM backport.

"bo->dma_buf" is not available in this tree, revert to the previous
free function.

NOTE: This commit does not compile due to missing RHEL-specific fix-ups,
which are split out into separate Git commits following this one.

If git bisect selected this commit, run "git bisect skip" and try again.
Repeat this until it selects a commit which compiles.

Signed-off-by: José Expósito <jexposit@redhat.com>

Author: jexposit

drivers/gpu/drm/tegra/gem.c

@@ -515,20 +515,19 @@ void tegra_bo_free_object(struct drm_gem_object *gem)
 				dev_name(mapping->dev));
 	}
 
-	if (tegra->domain) {
+	if (tegra->domain)
 		tegra_bo_iommu_unmap(tegra, bo);
 
-		if (drm_gem_is_imported(gem)) {
-			dma_buf_unmap_attachment_unlocked(gem->import_attach, bo->sgt,
-							  DMA_TO_DEVICE);
-			dma_buf_detach(gem->import_attach->dmabuf, gem->import_attach);
-		}
-	}
-
-	tegra_bo_free(gem->dev, bo);
+	if (gem->import_attach) {
+		struct dma_buf *dmabuf = gem->import_attach->dmabuf;
 
-	if (bo->dma_buf)
-		dma_buf_put(bo->dma_buf);
+		dma_buf_unmap_attachment_unlocked(gem->import_attach, bo->sgt,
+						  DMA_TO_DEVICE);
+		dma_buf_detach(dmabuf, gem->import_attach);
+		dma_buf_put(dmabuf);
+	} else {
+		tegra_bo_free(gem->dev, bo);
+	}
 
 	drm_gem_object_release(gem);
 	kfree(bo);